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 2013/02/18 09:51:07 UTC
svn commit: r1447149 - in /archiva/redback/redback-core/trunk/redback-rbac:
redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/
redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/
redback-rbac-...
Author: olamy
Date: Mon Feb 18 08:51:06 2013
New Revision: 1447149
URL: http://svn.apache.org/r1447149
Log:
add some informations for ui dynamic choose for rbacmanager implementations
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACManager.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java?rev=1447149&r1=1447148&r2=1447149&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java Mon Feb 18 08:51:06 2013
@@ -51,6 +51,12 @@ public abstract class AbstractRBACManage
//no op
}
+ public boolean isFinalImplementation()
+ {
+ return false;
+ }
+
+
public void addListener( RBACManagerListener listener )
{
if ( !listeners.contains( listener ) )
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACManager.java?rev=1447149&r1=1447148&r2=1447149&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACManager.java Mon Feb 18 08:51:06 2013
@@ -38,10 +38,6 @@ public interface RBACManager
void removeListener( RBACManagerListener listener );
- /**
- * @since 2.1
- */
- void initialize();
// ------------------------------------------------------------------
// Role Methods
@@ -427,4 +423,24 @@ public interface RBACManager
throws RbacManagerException;
void eraseDatabase();
+
+ /**
+ * 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();
+
+ /**
+ * @return true if this implementation is a final one and not a wrapper (configurable, cached)
+ * @since 2.1
+ */
+ boolean isFinalImplementation();
+
+ /**
+ * @return a key to be able to customize label in UI
+ * @since 2.1
+ */
+ String getDescriptionKey();
}
\ No newline at end of file
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java?rev=1447149&r1=1447148&r2=1447149&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java Mon Feb 18 08:51:06 2013
@@ -882,4 +882,16 @@ public class CachedRbacManager
{
this.rbacImpl = rbacImpl;
}
+
+
+ public boolean isFinalImplementation()
+ {
+ return true;
+ }
+
+ public String getDescriptionKey()
+ {
+ return "archiva.redback.rbacmanager.cached";
+ }
+
}
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java?rev=1447149&r1=1447148&r2=1447149&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java Mon Feb 18 08:51:06 2013
@@ -694,4 +694,15 @@ public class JdoRbacManager
{
this.enableCache = enableCache;
}
+
+ @Override
+ public boolean isFinalImplementation()
+ {
+ return true;
+ }
+
+ public String getDescriptionKey()
+ {
+ return "archiva.redback.rbacmanager.jdo";
+ }
}
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java?rev=1447149&r1=1447148&r2=1447149&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java Mon Feb 18 08:51:06 2013
@@ -1363,4 +1363,16 @@ public class LdapRbacManager
return sb.toString();
}
}
+
+
+ @Override
+ public boolean isFinalImplementation()
+ {
+ return true;
+ }
+
+ public String getDescriptionKey()
+ {
+ return "archiva.redback.rbacmanager.ldap";
+ }
}
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java?rev=1447149&r1=1447148&r2=1447149&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java Mon Feb 18 08:51:06 2013
@@ -65,6 +65,8 @@ public class MemoryRbacManager
private Map<String, UserAssignment> userAssignments = new HashMap<String, UserAssignment>();
+ private boolean hasTriggeredInit = false;
+
// ----------------------------------------------------------------------
// Role methods
// ----------------------------------------------------------------------
@@ -529,8 +531,6 @@ public class MemoryRbacManager
return resources.get( resourceIdentifier );
}
- private boolean hasTriggeredInit = false;
-
public void triggerInit()
{
if ( !hasTriggeredInit )
@@ -539,4 +539,15 @@ public class MemoryRbacManager
hasTriggeredInit = true;
}
}
+
+ @Override
+ public boolean isFinalImplementation()
+ {
+ return true;
+ }
+
+ public String getDescriptionKey()
+ {
+ return "archiva.redback.rbacmanager.memory";
+ }
}