Author: olamy
Date: Fri Nov 23 18:32:55 2012
New Revision: 1413018
URL: http://svn.apache.org/viewvc?rev=1413018&view=rev
Log:
return real bean id and add a flag to say if users can choose this
implementation or not
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-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.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
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.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=1413018&r1=1413017&r2=1413018&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 18:32:55 2012
@@ -147,4 +147,9 @@ public abstract class AbstractUserManage
// no op prevent sub classes to need implement this method
// sub classes can implement their own
}
+
+ public boolean isFinalImplementation()
+ {
+ return false;
+ }
}
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=1413018&r1=1413017&r2=1413018&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 18:32:55 2012
@@ -206,4 +206,10 @@ public interface UserManager
* @since 2.1
*/
void initialize();
+
+ /**
+ * @since 2.1
+ * @return true if this implementation is a final one and not a wrapper
(configurable, cached)
+ */
+ boolean isFinalImplementation();
}
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=1413018&r1=1413017&r2=1413018&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 18:32:55 2012
@@ -204,7 +204,7 @@ public class CachedUserManager
public String getId()
{
- return "Cached User Manager [" + this.userImpl.getId() + "]";
+ return "cached";
}
public List<User> getUsers()
@@ -323,4 +323,9 @@ public class CachedUserManager
{
// no op configurable impl do the job
}
+
+ public boolean isFinalImplementation()
+ {
+ return false;
+ }
}
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=1413018&r1=1413017&r2=1413018&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 18:32:55 2012
@@ -143,7 +143,7 @@ public class ConfigurableUserManager
public String getId()
{
- return ConfigurableUserManager.class.getName() + " wrapping " +
userManagerImpl.getId();
+ return "configurable";
}
public List<User> getUsers()
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=1413018&r1=1413017&r2=1413018&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
Fri Nov 23 18:32:55 2012
@@ -65,7 +65,7 @@ public class JdoUserManager
public String getId()
{
- return "JDO UserManager - " + this.getClass().getName();
+ return "jdo";
}
@@ -485,4 +485,9 @@ public class JdoUserManager
{
return userSecurityPolicy;
}
+
+ public boolean isFinalImplementation()
+ {
+ return true;
+ }
}
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=1413018&r1=1413017&r2=1413018&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 18:32:55 2012
@@ -358,7 +358,7 @@ public class LdapUserManager
public String getId()
{
- return "LDAP User-Manager: " + getClass().getName();
+ return "ldap";
}
/**
@@ -501,4 +501,8 @@ public class LdapUserManager
ldapCacheService.removeLdapUserDn( username );
}
+ public boolean isFinalImplementation()
+ {
+ return true;
+ }
}
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=1413018&r1=1413017&r2=1413018&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
Fri Nov 23 18:32:55 2012
@@ -55,25 +55,7 @@ public class MemoryUserManager
public String getId()
{
- Properties props = new Properties();
- URL url = this
- .getClass()
- .getResource(
-
"META-INF/maven/org/codehaus/plexus/redback/redback-users-memory/pom.properties"
);
-
- if ( url != null )
- {
- try
- {
- props.load( url.openStream() );
- return "MemoryUserManager - " + props.getProperty( "version" );
- }
- catch ( IOException e )
- {
- // Fall thru
- }
- }
- return "MemoryUserManager - (unknown version)";
+ return "memory";
}
public boolean isReadOnly()
