diff options
Diffstat (limited to 'archiva-modules/archiva-web')
7 files changed, 36 insertions, 8 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/v2/svc/maven/MavenManagedRepositoryService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/v2/svc/maven/MavenManagedRepositoryService.java index f8e3f314c..c8cd8522c 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/v2/svc/maven/MavenManagedRepositoryService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/v2/svc/maven/MavenManagedRepositoryService.java @@ -67,7 +67,7 @@ import static org.apache.archiva.security.common.ArchivaRoleConstants.*; * </li> * </ul> * - * @author Martin Stockhammer <martin_s@apache.org> + * @author Martin Schreier <martin_s@apache.org> * @since 3.0 */ @Schema( name = "MavenManagedRepositoryService", description = "Managing and configuration of managed maven repositories" ) @@ -425,7 +425,7 @@ public interface MavenManagedRepositoryService permissions = { OPERATION_MANAGE_CONFIGURATION, OPERATION_DELETE_NAMESPACE }, resource = "{id}" ) - @Operation( summary = "Removes a group and all subfolders from the repository", + @Operation( summary = "Removes a maven group and all containing artifacts and sub groups from the repository", security = { @SecurityRequirement( name = OPERATION_MANAGE_CONFIGURATION 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 81b58aa94..ea3f17948 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 @@ -33,6 +33,7 @@ import org.apache.archiva.redback.policy.CookieSettings; import org.apache.archiva.redback.policy.PasswordRule; import org.apache.archiva.redback.rbac.RBACManager; import org.apache.archiva.redback.role.RoleManager; +import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.rest.api.model.ActionStatus; import org.apache.archiva.rest.api.model.RBACManagerImplementationInformation; @@ -88,7 +89,7 @@ public class DefaultRedbackRuntimeConfigurationService @Inject @Named(value = "cache#users") - private Cache usersCache; + private Cache<String, User> usersCache; @Inject private LdapUserMapper ldapUserMapper; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java index 02e4f9ecb..f7871e75a 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java @@ -159,7 +159,7 @@ public class DefaultRepositoriesService */ @Inject @Named(value = "cache#namespaces") - private Cache<String, Collection<String>> namespacesCache; + private Cache<String, List<String>> namespacesCache; private List<ChecksumAlgorithm> algorithms = Arrays.asList(ChecksumAlgorithm.SHA256, ChecksumAlgorithm.SHA1, ChecksumAlgorithm.MD5 ); diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml index 6f5f1fc1f..044998678 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml @@ -128,11 +128,13 @@ <bean name="browse#versionMetadata" class="org.apache.archiva.components.cache.ehcache.EhcacheCache" init-method="initialize"> + <constructor-arg index="0" value="java.lang.String" /> + <constructor-arg index="1" value="org.apache.archiva.metadata.model.ProjectVersionMetadata"/> <property name="diskPersistent" value="false"/> <property name="eternal" value="false"/> <property name="maxElementsInMemory" value="1000"/> <property name="memoryEvictionPolicy" value="LRU"/> - <property name="name" value="userPermissions"/> + <property name="name" value="versionMetadata"/> <property name="timeToIdleSeconds" value="300"/> <property name="timeToLiveSeconds" value="600"/> </bean> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/v2/svc/AbstractNativeRestServices.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/v2/svc/AbstractNativeRestServices.java index 4949e55a7..b5b185684 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/v2/svc/AbstractNativeRestServices.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/v2/svc/AbstractNativeRestServices.java @@ -68,7 +68,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; * Native REST tests do not use the JAX-RS client and can be used with a remote * REST API service. The tests * - * @author Martin Stockhammer <martin_s@apache.org> + * @author Martin Schreier <martin_s@apache.org> */ @Tag( "rest-native" ) @Tag( "rest-v2" ) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/v2/svc/NativeMavenManagedRepositoryServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/v2/svc/maven/NativeMavenManagedRepositoryServiceTest.java index d078b454e..9a8f932be 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/v2/svc/NativeMavenManagedRepositoryServiceTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/v2/svc/maven/NativeMavenManagedRepositoryServiceTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.rest.v2.svc; +package org.apache.archiva.rest.v2.svc.maven; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,6 +22,7 @@ import io.restassured.path.json.JsonPath; import io.restassured.response.Response; import org.apache.archiva.rest.api.v2.model.MavenManagedRepository; import org.apache.archiva.rest.api.v2.svc.RestConfiguration; +import org.apache.archiva.rest.v2.svc.AbstractNativeRestServices; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; @@ -39,7 +40,7 @@ import static io.restassured.http.ContentType.JSON; import static org.junit.jupiter.api.Assertions.*; /** - * @author Martin Stockhammer <martin_s@apache.org> + * @author Martin Schreier <martin_s@apache.org> */ @TestInstance( TestInstance.Lifecycle.PER_CLASS ) @Tag( "rest-native" ) diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml index 0a64d5880..5751f60ea 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml @@ -119,6 +119,8 @@ <!-- for change configuration of the users cache --> <bean name="cache#users" class="org.apache.archiva.components.cache.ehcache.EhcacheCache" init-method="initialize"> + <constructor-arg index="0" value="java.lang.String" /> + <constructor-arg index="1" value="org.apache.archiva.redback.users.User" /> <property name="diskPersistent" value="false"/> <property name="eternal" value="false"/> <property name="maxElementsInMemory" value="1000"/> @@ -132,6 +134,8 @@ <bean name="cache#url-failures-cache" class="org.apache.archiva.components.cache.ehcache.EhcacheCache" lazy-init="true" destroy-method="dispose"> + <constructor-arg index="0" value="java.lang.String"/> + <constructor-arg index="1" value="java.util.Date"/> <property name="diskExpiryThreadIntervalSeconds" value="600"/> <property name="diskPersistent" value="true"/> <property name="diskStorePath" value="${appserver.base}/tmp/urlcache"/> @@ -147,6 +151,8 @@ <bean name="cache#keys" class="org.apache.archiva.components.cache.ehcache.EhcacheCache" init-method="initialize"> + <constructor-arg index="0" value="java.lang.String" /> + <constructor-arg index="1" value="org.apache.archiva.redback.keys.AuthenticationKey"/> <property name="diskPersistent" value="false"/> <property name="eternal" value="false"/> <property name="maxElementsInMemory" value="1000"/> @@ -158,6 +164,8 @@ <bean name="cache#operations" class="org.apache.archiva.components.cache.ehcache.EhcacheCache" init-method="initialize"> + <constructor-arg index="0" value="java.lang.String"/> + <constructor-arg index="1" value="org.apache.archiva.redback.rbac.Operation" /> <property name="diskPersistent" value="false"/> <property name="eternal" value="false"/> <property name="maxElementsInMemory" value="1000"/> @@ -169,6 +177,8 @@ <bean name="cache#permissions" class="org.apache.archiva.components.cache.ehcache.EhcacheCache" init-method="initialize"> + <constructor-arg index="0" value="java.lang.String"/> + <constructor-arg index="1" value="org.apache.archiva.redback.rbac.Permission" /> <property name="diskPersistent" value="false"/> <property name="eternal" value="false"/> <property name="maxElementsInMemory" value="1000"/> @@ -180,6 +190,8 @@ <bean name="cache#resources" class="org.apache.archiva.components.cache.ehcache.EhcacheCache" init-method="initialize"> + <constructor-arg index="0" value="java.lang.String"/> + <constructor-arg index="1" value="org.apache.archiva.redback.rbac.Resource" /> <property name="diskPersistent" value="false"/> <property name="eternal" value="false"/> <property name="maxElementsInMemory" value="1000"/> @@ -191,6 +203,8 @@ <bean name="cache#roles" class="org.apache.archiva.components.cache.ehcache.EhcacheCache" init-method="initialize"> + <constructor-arg index="0" value="java.lang.String"/> + <constructor-arg index="1" value="org.apache.archiva.redback.rbac.Role" /> <property name="diskPersistent" value="false"/> <property name="eternal" value="false"/> <property name="maxElementsInMemory" value="1000"/> @@ -202,6 +216,8 @@ <bean name="cache#effectiveRoleSet" class="org.apache.archiva.components.cache.ehcache.EhcacheCache" init-method="initialize"> + <constructor-arg index="0" value="java.lang.String"/> + <constructor-arg index="1" value="java.util.HashSet" /> <property name="diskPersistent" value="false"/> <property name="eternal" value="false"/> <property name="maxElementsInMemory" value="1000"/> @@ -217,6 +233,8 @@ <bean name="cache#userAssignments" class="org.apache.archiva.components.cache.ehcache.EhcacheCache" init-method="initialize"> + <constructor-arg index="0" value="java.lang.String"/> + <constructor-arg index="1" value="org.apache.archiva.redback.rbac.UserAssignment" /> <property name="diskPersistent" value="false"/> <property name="eternal" value="false"/> <property name="maxElementsInMemory" value="1000"/> @@ -228,6 +246,8 @@ <bean name="cache#userPermissions" class="org.apache.archiva.components.cache.ehcache.EhcacheCache" init-method="initialize"> + <constructor-arg index="0" value="java.lang.String"/> + <constructor-arg index="1" value="java.util.HashMap" /> <property name="diskPersistent" value="false"/> <property name="eternal" value="false"/> <property name="maxElementsInMemory" value="1000"/> @@ -239,6 +259,8 @@ <bean name="cache#ldapRoles" class="org.apache.archiva.components.cache.ehcache.EhcacheCache" init-method="initialize"> + <constructor-arg index="0" value="java.lang.String"/> + <constructor-arg index="1" value="org.apache.archiva.redback.rbac.Role"/> <property name="diskPersistent" value="false"/> <property name="eternal" value="false"/> <property name="maxElementsInMemory" value="1000"/> @@ -250,6 +272,8 @@ <bean name="cache#namespaces" class="org.apache.archiva.components.cache.ehcache.EhcacheCache" init-method="initialize"> + <constructor-arg index="0" value="java.lang.String" /> + <constructor-arg index="1" value="java.util.ArrayList"/> <property name="diskPersistent" value="false"/> <property name="eternal" value="false"/> <property name="maxElementsInMemory" value="1000"/> |