You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2016/10/25 20:44:19 UTC
[1/3] archiva git commit: Fix i18n string for JPA RBac Manager
Repository: archiva
Updated Branches:
refs/heads/jpa 2164ef75c -> 593d69f52
Fix i18n string for JPA RBac Manager
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/203de64d
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/203de64d
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/203de64d
Branch: refs/heads/jpa
Commit: 203de64d1993741fb80eb5771751a0769b9e1428
Parents: 2164ef7
Author: Martin Stockhammer <ma...@apache.org>
Authored: Mon Oct 24 22:03:48 2016 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Mon Oct 24 22:03:48 2016 +0200
----------------------------------------------------------------------
.../src/main/resources/org/apache/archiva/i18n/default.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/203de64d/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index b5784b6..5b8e0c7 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -673,7 +673,7 @@ redback.runtime.users.cache.title=Users Cache
archiva.redback.rbacmanager.ldap=LDAP RBac Manager
archiva.redback.rbacmanager.jdo=Database RBac Manager
-archiva.redback.rbackmanager.jpa=Database JPA RBac Manager
+archiva.redback.rbacmanager.jpa=Database JPA RBac Manager
archiva.redback.rbacmanager.cached=Cached RBac Manager
redback.runtime.rbac-managers.impls.chose=RbacManager(s) chosen
redback.runtime.rbac-managers.impls.available=Available RbacManagers
[3/3] archiva git commit: Add cache reset after configuration save
Posted by ma...@apache.org.
Add cache reset after configuration save
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/593d69f5
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/593d69f5
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/593d69f5
Branch: refs/heads/jpa
Commit: 593d69f52eae0b0187a817212c29388968a2add8
Parents: 4932324
Author: Martin Stockhammer <ma...@apache.org>
Authored: Tue Oct 25 22:43:09 2016 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Tue Oct 25 22:43:09 2016 +0200
----------------------------------------------------------------------
.../archiva/web/security/ArchivaRbacManager.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/593d69f5/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
index 143f3c2..6b2eb9e 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
@@ -98,6 +98,8 @@ public class ArchivaRbacManager
List<String> rbacManagerIds =
redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration().getRbacManagerImpls();
+ clearCaches();
+
if ( rbacManagerIds.isEmpty() )
{
rbacManagerIds.add( RedbackRuntimeConfigurationAdmin.DEFAULT_RBAC_MANAGER_IMPL );
@@ -113,6 +115,7 @@ public class ArchivaRbacManager
rbacManagersPerId.put( id, rbacManager );
}
+
}
catch ( RepositoryAdminException e )
{
@@ -122,12 +125,23 @@ public class ArchivaRbacManager
}
}
+ private void clearCaches() {
+ resourcesCache.clear();
+ operationsCache.clear();
+ permissionsCache.clear();
+ rolesCache.clear();
+ userAssignmentsCache.clear();
+ userPermissionsCache.clear();
+ effectiveRoleSetCache.clear();
+ }
+
protected RBACManager getRbacManagerForWrite()
{
for ( RBACManager rbacManager : this.rbacManagersPerId.values() )
{
if ( !rbacManager.isReadOnly() )
{
+ log.debug("Writable Rbac manager {}", rbacManager.getDescriptionKey());
return rbacManager;
}
}
[2/3] archiva git commit: Remove comment
Posted by ma...@apache.org.
Remove comment
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/49323248
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/49323248
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/49323248
Branch: refs/heads/jpa
Commit: 49323248e413901a881936be824a03292f9302fe
Parents: 203de64
Author: Martin Stockhammer <ma...@apache.org>
Authored: Tue Oct 25 22:42:39 2016 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Tue Oct 25 22:42:39 2016 +0200
----------------------------------------------------------------------
.../rest/services/DefaultRedbackRuntimeConfigurationService.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/49323248/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
index 0284bb8..d75d075 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
@@ -220,7 +220,8 @@ public class DefaultRedbackRuntimeConfigurationService
}
}
- //check repositories roles are here !!!
+
+
return Boolean.TRUE;
}