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/08 00:29:02 UTC
svn commit: r1310894 [2/2] - in /archiva/redback/redback-core/trunk:
redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/
redback-authentication/redback-authentication-providers/redback-authenticati...
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordEncodingException.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordEncodingException.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordEncodingException.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordEncodingException.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordEncodingException.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordEncodingException.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordEncodingException.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy;
+package org.apache.archiva.redback.policy;
/*
* Copyright 2001-2006 The Apache Software Foundation.
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRule.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordRule.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRule.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRule.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordRule.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordRule.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRule.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy;
+package org.apache.archiva.redback.policy;
/*
* Copyright 2001-2006 The Apache Software Foundation.
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolationException.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordRuleViolationException.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolationException.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolationException.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordRuleViolationException.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordRuleViolationException.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolationException.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy;
+package org.apache.archiva.redback.policy;
/*
* Copyright 2001-2006 The Apache Software Foundation.
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolations.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordRuleViolations.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolations.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolations.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordRuleViolations.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordRuleViolations.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolations.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy;
+package org.apache.archiva.redback.policy;
/*
* Copyright 2001-2006 The Apache Software Foundation.
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyContext.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PolicyContext.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyContext.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyContext.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PolicyContext.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PolicyContext.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyContext.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy;
+package org.apache.archiva.redback.policy;
/*
* Copyright 2001-2006 The Apache Software Foundation.
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyViolationException.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PolicyViolationException.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyViolationException.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyViolationException.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PolicyViolationException.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PolicyViolationException.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyViolationException.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy;
+package org.apache.archiva.redback.policy;
/*
* Copyright 2001-2006 The Apache Software Foundation.
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/RememberMeCookieSettings.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/RememberMeCookieSettings.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/RememberMeCookieSettings.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy;
+package org.apache.archiva.redback.policy;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,7 @@ package org.codehaus.plexus.redback.poli
* under the License.
*/
+import org.apache.archiva.redback.policy.AbstractCookieSettings;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/SignonCookieSettings.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/SignonCookieSettings.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/SignonCookieSettings.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/SignonCookieSettings.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/SignonCookieSettings.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/SignonCookieSettings.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/SignonCookieSettings.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy;
+package org.apache.archiva.redback.policy;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,7 @@ package org.codehaus.plexus.redback.poli
* under the License.
*/
+import org.apache.archiva.redback.policy.AbstractCookieSettings;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserSecurityPolicy.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/UserSecurityPolicy.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserSecurityPolicy.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserSecurityPolicy.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/UserSecurityPolicy.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/UserSecurityPolicy.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserSecurityPolicy.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy;
+package org.apache.archiva.redback.policy;
/*
* Copyright 2001-2006 The Apache Software Foundation.
@@ -197,7 +197,7 @@ public interface UserSecurityPolicy
* Extension Point - Test if user has excessive logins
*
* @param user the user to test excessive logins against.
- * @throws AccountLockedException if the number of logins was exceeded
+ * @throws org.apache.archiva.redback.policy.AccountLockedException if the number of logins was exceeded
*/
void extensionExcessiveLoginAttempts( User user )
throws AccountLockedException;
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserValidationSettings.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/UserValidationSettings.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserValidationSettings.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserValidationSettings.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/UserValidationSettings.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/UserValidationSettings.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserValidationSettings.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy;
+package org.apache.archiva.redback.policy;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/AbstractJAASPasswordEncoder.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/encoders/AbstractJAASPasswordEncoder.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/AbstractJAASPasswordEncoder.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/AbstractJAASPasswordEncoder.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/encoders/AbstractJAASPasswordEncoder.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/encoders/AbstractJAASPasswordEncoder.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/AbstractJAASPasswordEncoder.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy.encoders;
+package org.apache.archiva.redback.policy.encoders;
/*
* Copyright 2001-2006 The Apache Software Foundation.
@@ -16,11 +16,11 @@ package org.codehaus.plexus.redback.poli
* limitations under the License.
*/
+import org.apache.archiva.redback.policy.PasswordEncoder;
+import org.apache.archiva.redback.policy.PasswordEncodingException;
import org.apache.archiva.redback.users.Messages;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringUtils;
-import org.codehaus.plexus.redback.policy.PasswordEncoder;
-import org.codehaus.plexus.redback.policy.PasswordEncodingException;
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/PlainTextPasswordEncoder.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/encoders/PlainTextPasswordEncoder.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/PlainTextPasswordEncoder.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/PlainTextPasswordEncoder.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/encoders/PlainTextPasswordEncoder.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/encoders/PlainTextPasswordEncoder.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/PlainTextPasswordEncoder.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy.encoders;
+package org.apache.archiva.redback.policy.encoders;
/*
* Copyright 2001-2006 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.codehaus.plexus.redback.poli
* limitations under the License.
*/
-import org.codehaus.plexus.redback.policy.PasswordEncoder;
+import org.apache.archiva.redback.policy.PasswordEncoder;
import org.springframework.stereotype.Service;
/**
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA1PasswordEncoder.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/encoders/SHA1PasswordEncoder.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA1PasswordEncoder.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA1PasswordEncoder.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/encoders/SHA1PasswordEncoder.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/encoders/SHA1PasswordEncoder.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA1PasswordEncoder.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy.encoders;
+package org.apache.archiva.redback.policy.encoders;
/*
* Copyright 2006 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.codehaus.plexus.redback.poli
* limitations under the License.
*/
-import org.codehaus.plexus.redback.policy.PasswordEncoder;
+import org.apache.archiva.redback.policy.PasswordEncoder;
import org.springframework.stereotype.Service;
/**
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA256PasswordEncoder.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/encoders/SHA256PasswordEncoder.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA256PasswordEncoder.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA256PasswordEncoder.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/encoders/SHA256PasswordEncoder.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/encoders/SHA256PasswordEncoder.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA256PasswordEncoder.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy.encoders;
+package org.apache.archiva.redback.policy.encoders;
/*
* Copyright 2006 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.codehaus.plexus.redback.poli
* limitations under the License.
*/
-import org.codehaus.plexus.redback.policy.PasswordEncoder;
+import org.apache.archiva.redback.policy.PasswordEncoder;
import org.springframework.stereotype.Service;
/**
Added: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java?rev=1310894&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java (added)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java Sat Apr 7 22:28:59 2012
@@ -0,0 +1,53 @@
+package org.apache.archiva.redback.policy.rules;
+
+/*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.archiva.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.policy.PasswordRule;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+/**
+ * AbstractPasswordRule
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public abstract class AbstractPasswordRule
+ implements PasswordRule
+{
+ protected boolean enabled = true;
+
+ @Inject @Named (value="userConfiguration")
+ protected UserConfiguration config;
+
+ public boolean isEnabled()
+ {
+ return enabled;
+ }
+
+ /**
+ * true if the security policy is required for the rule to execute
+ *
+ * @return boolean
+ */
+ public boolean requiresSecurityPolicy()
+ {
+ return false;
+ }
+}
Propchange: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaNumericPasswordRule.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AlphaNumericPasswordRule.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaNumericPasswordRule.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaNumericPasswordRule.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AlphaNumericPasswordRule.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AlphaNumericPasswordRule.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaNumericPasswordRule.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy.rules;
+package org.apache.archiva.redback.policy.rules;
/*
* Copyright 2001-2006 The Apache Software Foundation.
@@ -16,9 +16,9 @@ package org.codehaus.plexus.redback.poli
* limitations under the License.
*/
+import org.apache.archiva.redback.policy.PasswordRuleViolations;
+import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User;
-import org.codehaus.plexus.redback.policy.PasswordRuleViolations;
-import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaPasswordRule.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AlphaPasswordRule.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaPasswordRule.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaPasswordRule.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AlphaPasswordRule.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AlphaPasswordRule.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaPasswordRule.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy.rules;
+package org.apache.archiva.redback.policy.rules;
/*
* Copyright 2001-2006 The Apache Software Foundation.
@@ -16,8 +16,8 @@ package org.codehaus.plexus.redback.poli
* limitations under the License.
*/
-import org.codehaus.plexus.redback.policy.PasswordRuleViolations;
-import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
+import org.apache.archiva.redback.policy.PasswordRuleViolations;
+import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/CharacterLengthPasswordRule.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/CharacterLengthPasswordRule.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/CharacterLengthPasswordRule.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/CharacterLengthPasswordRule.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/CharacterLengthPasswordRule.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/CharacterLengthPasswordRule.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/CharacterLengthPasswordRule.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy.rules;
+package org.apache.archiva.redback.policy.rules;
/*
* Copyright 2001-2006 The Apache Software Foundation.
@@ -16,9 +16,9 @@ package org.codehaus.plexus.redback.poli
* limitations under the License.
*/
+import org.apache.archiva.redback.policy.PasswordRuleViolations;
+import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User;
-import org.codehaus.plexus.redback.policy.PasswordRuleViolations;
-import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/MustHavePasswordRule.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/MustHavePasswordRule.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/MustHavePasswordRule.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/MustHavePasswordRule.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/MustHavePasswordRule.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/MustHavePasswordRule.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/MustHavePasswordRule.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy.rules;
+package org.apache.archiva.redback.policy.rules;
/*
* Copyright 2006 The Apache Software Foundation.
@@ -16,8 +16,8 @@ package org.codehaus.plexus.redback.poli
* limitations under the License.
*/
-import org.codehaus.plexus.redback.policy.PasswordRuleViolations;
-import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
+import org.apache.archiva.redback.policy.PasswordRuleViolations;
+import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/NumericalPasswordRule.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/NumericalPasswordRule.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/NumericalPasswordRule.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/NumericalPasswordRule.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/NumericalPasswordRule.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/NumericalPasswordRule.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/NumericalPasswordRule.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy.rules;
+package org.apache.archiva.redback.policy.rules;
/*
* Copyright 2001-2006 The Apache Software Foundation.
@@ -17,8 +17,8 @@ package org.codehaus.plexus.redback.poli
*/
import org.apache.archiva.redback.users.User;
-import org.codehaus.plexus.redback.policy.PasswordRuleViolations;
-import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
+import org.apache.archiva.redback.policy.PasswordRuleViolations;
+import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/ReusePasswordRule.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/ReusePasswordRule.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/ReusePasswordRule.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/ReusePasswordRule.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/ReusePasswordRule.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/ReusePasswordRule.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/ReusePasswordRule.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy.rules;
+package org.apache.archiva.redback.policy.rules;
/*
* Copyright 2001-2006 The Apache Software Foundation.
@@ -16,8 +16,8 @@ package org.codehaus.plexus.redback.poli
* limitations under the License.
*/
-import org.codehaus.plexus.redback.policy.PasswordRuleViolations;
-import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
+import org.apache.archiva.redback.policy.PasswordRuleViolations;
+import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
Copied: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/WhitespacePasswordRule.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/WhitespacePasswordRule.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/WhitespacePasswordRule.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/WhitespacePasswordRule.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/WhitespacePasswordRule.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/WhitespacePasswordRule.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/WhitespacePasswordRule.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy.rules;
+package org.apache.archiva.redback.policy.rules;
/*
* Copyright 2001-2006 The Apache Software Foundation.
@@ -16,8 +16,8 @@ package org.codehaus.plexus.redback.poli
* limitations under the License.
*/
-import org.codehaus.plexus.redback.policy.PasswordRuleViolations;
-import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
+import org.apache.archiva.redback.policy.PasswordRuleViolations;
+import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User;
import org.springframework.stereotype.Service;
Modified: archiva/redback/redback-core/trunk/redback-policy/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/resources/META-INF/spring-context.xml?rev=1310894&r1=1310893&r2=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/resources/META-INF/spring-context.xml Sat Apr 7 22:28:59 2012
@@ -28,6 +28,6 @@
default-lazy-init="true">
<context:annotation-config />
- <context:component-scan base-package="org.codehaus.plexus.redback.policy"/>
+ <context:component-scan base-package="org.apache.archiva.redback.policy"/>
</beans>
\ No newline at end of file
Copied: archiva/redback/redback-core/trunk/redback-policy/src/test/java/org/apache/archiva/redback/policy/PasswordEncoderTest.java (from r1310886, archiva/redback/redback-core/trunk/redback-policy/src/test/java/org/codehaus/plexus/redback/policy/PasswordEncoderTest.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/test/java/org/apache/archiva/redback/policy/PasswordEncoderTest.java?p2=archiva/redback/redback-core/trunk/redback-policy/src/test/java/org/apache/archiva/redback/policy/PasswordEncoderTest.java&p1=archiva/redback/redback-core/trunk/redback-policy/src/test/java/org/codehaus/plexus/redback/policy/PasswordEncoderTest.java&r1=1310886&r2=1310894&rev=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/test/java/org/codehaus/plexus/redback/policy/PasswordEncoderTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/test/java/org/apache/archiva/redback/policy/PasswordEncoderTest.java Sat Apr 7 22:28:59 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.policy;
+package org.apache.archiva.redback.policy;
/*
* Copyright 2001-2006 The Apache Software Foundation.
@@ -17,6 +17,7 @@ package org.codehaus.plexus.redback.poli
*/
import junit.framework.TestCase;
+import org.apache.archiva.redback.policy.PasswordEncoder;
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=1310894&r1=1310893&r2=1310894&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 22:28:59 2012
@@ -20,6 +20,8 @@ package org.codehaus.plexus.redback.syst
*/
import org.apache.archiva.redback.keys.KeyManager;
+import org.apache.archiva.redback.policy.AccountLockedException;
+import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
@@ -31,9 +33,7 @@ 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.policy.AccountLockedException;
-import org.codehaus.plexus.redback.policy.MustChangePasswordException;
-import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
+import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@@ -91,7 +91,7 @@ public class DefaultSecuritySystem
* @throws AuthenticationException
* @throws UserNotFoundException
* @throws MustChangePasswordException
- * @throws AccountLockedException
+ * @throws org.apache.archiva.redback.policy.AccountLockedException
* @throws MustChangePasswordException
*/
public SecuritySession authenticate( AuthenticationDataSource source )
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=1310894&r1=1310893&r2=1310894&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 22:28:59 2012
@@ -19,15 +19,15 @@ package org.codehaus.plexus.redback.syst
* under the License.
*/
+import org.apache.archiva.redback.policy.AccountLockedException;
+import org.apache.archiva.redback.policy.MustChangePasswordException;
+import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authorization.AuthorizationException;
import org.apache.archiva.redback.authorization.AuthorizationResult;
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;
import org.apache.archiva.redback.users.UserManager;
/**
Modified: archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java?rev=1310894&r1=1310893&r2=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java Sat Apr 7 22:28:59 2012
@@ -20,6 +20,9 @@ package org.apache.archiva.redback.authe
*/
import org.apache.archiva.redback.authentication.Authenticator;
+import org.apache.archiva.redback.policy.AccountLockedException;
+import org.apache.archiva.redback.policy.PasswordEncoder;
+import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authentication.AuthenticationConstants;
@@ -27,11 +30,8 @@ import org.apache.archiva.redback.authen
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.policy.AccountLockedException;
-import org.codehaus.plexus.redback.policy.MustChangePasswordException;
-import org.codehaus.plexus.redback.policy.PasswordEncoder;
-import org.codehaus.plexus.redback.policy.PolicyViolationException;
-import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
+import org.apache.archiva.redback.policy.MustChangePasswordException;
+import org.apache.archiva.redback.policy.PolicyViolationException;
import org.apache.archiva.redback.users.User;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,7 +67,7 @@ public class UserManagerAuthenticator
}
/**
- * @throws org.codehaus.plexus.redback.policy.AccountLockedException
+ * @throws org.apache.archiva.redback.policy.AccountLockedException
*
* @throws MustChangePasswordException
* @throws MustChangePasswordException
Modified: archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/test/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/test/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticatorTest.java?rev=1310894&r1=1310893&r2=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/test/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticatorTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/test/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticatorTest.java Sat Apr 7 22:28:59 2012
@@ -21,15 +21,15 @@ package org.apache.archiva.redback.authe
import junit.framework.TestCase;
import org.apache.archiva.redback.authentication.Authenticator;
+import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.policy.AccountLockedException;
-import org.codehaus.plexus.redback.policy.MustChangePasswordException;
-import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
+import org.apache.archiva.redback.policy.AccountLockedException;
+import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java?rev=1310894&r1=1310893&r2=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java Sat Apr 7 22:28:59 2012
@@ -19,6 +19,7 @@ package org.apache.archiva.redback.users
* under the License.
*/
+import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.AbstractUserManager;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManagerException;
@@ -27,7 +28,6 @@ import org.codehaus.plexus.jdo.JdoFactor
import org.codehaus.plexus.jdo.PlexusJdoUtils;
import org.codehaus.plexus.jdo.PlexusObjectNotFoundException;
import org.codehaus.plexus.jdo.PlexusStoreException;
-import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.PermanentUserException;
import org.apache.archiva.redback.users.UserQuery;
import org.codehaus.plexus.redback.users.jdo.JdoUser;
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java?rev=1310894&r1=1310893&r2=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java Sat Apr 7 22:28:59 2012
@@ -20,11 +20,11 @@ package org.apache.archiva.redback.users
*/
import junit.framework.TestCase;
+import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
-import org.codehaus.plexus.redback.policy.PasswordEncoder;
-import org.codehaus.plexus.redback.policy.encoders.SHA1PasswordEncoder;
+import org.apache.archiva.redback.policy.encoders.SHA1PasswordEncoder;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java?rev=1310894&r1=1310893&r2=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java Sat Apr 7 22:28:59 2012
@@ -21,7 +21,7 @@ package org.apache.archiva.redback.users
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
-import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
+import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.AbstractUserManager;
import org.apache.archiva.redback.users.PermanentUserException;
import org.apache.archiva.redback.users.UserQuery;
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java?rev=1310894&r1=1310893&r2=1310894&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java Sat Apr 7 22:28:59 2012
@@ -20,10 +20,10 @@ package org.apache.archiva.redback.users
*/
import junit.framework.TestCase;
+import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.users.UserQuery;
-import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.PermanentUserException;
import org.apache.archiva.redback.users.UserManager;
import org.junit.Test;