Author: olamy
Date: Fri Nov 23 10:10:28 2012
New Revision: 1412808
URL: http://svn.apache.org/viewvc?rev=1412808&view=rev
Log:
[MRM-1714] using LDAP can be configurable with the ui.
prepare redback
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/AbstractUserManager.java
archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManager.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/AbstractUserManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/AbstractUserManager.java?rev=1412808&r1=1412807&r2=1412808&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/AbstractUserManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/AbstractUserManager.java
Fri Nov 23 10:10:28 2012
@@ -25,6 +25,8 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.annotation.PostConstruct;
+
/**
* AbstractUserManager
*
@@ -139,4 +141,10 @@ public abstract class AbstractUserManage
user = addUser( user );
return user;
}
+
+ public void initialize()
+ {
+ // no op prevent sub classes to need implement this method
+ // sub classes can implement their own
+ }
}
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManager.java?rev=1412808&r1=1412807&r2=1412808&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManager.java
Fri Nov 23 10:10:28 2012
@@ -198,4 +198,12 @@ public interface UserManager
User updateUser( User user, boolean passwordChangeRequired )
throws UserNotFoundException;
+
+
+ /**
+ * consumer of user manager can use it to reload various configuration
+ * with the configurable implementation is possible to change dynamically
the real implementation used.
+ * @since 2.1
+ */
+ void initialize();
}
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java?rev=1412808&r1=1412807&r2=1412808&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
Fri Nov 23 10:10:28 2012
@@ -318,4 +318,9 @@ public class CachedUserManager
{
this.usersCache = usersCache;
}
+
+ public void initialize()
+ {
+ // no op configurable impl do the job
+ }
}
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java?rev=1412808&r1=1412807&r2=1412808&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
Fri Nov 23 10:10:28 2012
@@ -37,6 +37,7 @@ import java.util.List;
@Service( "userManager#configurable" )
public class ConfigurableUserManager
extends AbstractUserManager
+ implements UserManager
{
@Inject
@Named( value = "userConfiguration" )
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java?rev=1412808&r1=1412807&r2=1412808&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java
Fri Nov 23 10:10:28 2012
@@ -24,6 +24,7 @@ import org.apache.archiva.redback.common
import org.apache.archiva.redback.common.ldap.UserMapper;
import org.apache.archiva.redback.users.AbstractUserManager;
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.common.ldap.MappingException;
import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
@@ -49,6 +50,7 @@ import java.util.List;
@Service( "userManager#ldap" )
public class LdapUserManager
extends AbstractUserManager
+ implements UserManager
{
@Inject
@Named( value = "ldapConnectionFactory#configurable" )
