Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switching to moved component-spring-cache module

This commit is contained in:
Martin Stockhammer 2019-11-19 23:36:13 +01:00
parent 7e9ac6763e
commit 5a080e52e5
23 changed files with 65 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pom.xml
View File

@ -322,19 +322,19 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-api</artifactId>
<version>${redback.comp.spring-cache.version}</version>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-api</artifactId>
<version>${archiva.comp.version}</version>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-ehcache</artifactId>
<version>${redback.comp.spring-cache.version}</version>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-ehcache</artifactId>
<version>${archiva.comp.version}</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>2.7.5</version>
<version>2.10.6</version>
</dependency>
<dependency>
<groupId>org.apache.archiva.components</groupId>

2
redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
View File

@ -37,7 +37,7 @@
<alias name="userManager#memory" alias="userManager#jpa"/>
<bean name="cache#users" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
<bean name="cache#users" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>

21
redback-integrations/redback-rest/redback-rest-api/src/enunciate/enunciate.xml
View File

@ -17,24 +17,29 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<enunciate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-2.0.0.xsd">
<services>
<rest defaultRestSubcontext="redbackServices"/>
</services>
<enunciate
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.12.0.xsd">
<title>Apache Archiva Redback REST API</title>
<modules>
<jaxrs>
<application path="redbackServices" />
</jaxrs>
<cxf disabled="false"/>
<jersey disabled="true" />
<jersey disabled="true"/>
<c disabled="true"/>
<csharp disabled="true"/>
<obj-c disabled="true"/>
<jaxws-ri disabled="true"/>
<jaxws-support disabled="true"/>
<jaxon1 disabled="true"/>
<jackson1 disabled="true"/>
<java-json-client disabled="true"/>
<docs disabled="false" title="Apache Archiva Redback REST API" includeExampleXml="true" includeExampleJson="true"
includeDefaultDownloads="false" docsSubdir="" freemarkerTemplate="${project.basedir}/src/enunciate/archiva.fmt" css="${project.basedir}/src/enunciate/archiva.css">
<docs disabled="false"
docsSubdir="" freemarkerTemplate="${project.basedir}/src/enunciate/archiva.fmt" css="${project.basedir}/src/enunciate/archiva.css">
<!-- <war docsDir="apidocs" /> -->
</docs>

2
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
View File

@ -22,7 +22,7 @@ package org.apache.archiva.redback.rest.services;
import net.sf.ehcache.CacheManager;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
import org.apache.archiva.redback.components.cache.Cache;
import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.UserConfigurationKeys;
import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;

8
redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
View File

@ -39,12 +39,12 @@
<artifactId>redback-keys-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-api</artifactId>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-ehcache</artifactId>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>

2
redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
View File

@ -19,7 +19,7 @@ package org.apache.archiva.redback.keys.cached;
* under the License.
*/
import org.apache.archiva.redback.components.cache.Cache;
import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.redback.keys.AbstractKeyManager;
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.keys.KeyManager;

2
redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
View File

@ -31,7 +31,7 @@
<context:component-scan
base-package="org.apache.archiva.redback.keys.cached"/>
<bean name="cache#keys" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
<bean name="cache#keys" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>

2
redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
View File

@ -37,7 +37,7 @@
<alias name="commons-configuration" alias="test-conf"/>
<bean name="cache#keys" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
<bean name="cache#keys" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>

8
redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
View File

@ -47,12 +47,12 @@
<artifactId>redback-rbac-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-api</artifactId>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-ehcache</artifactId>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.components.registry</groupId>

2
redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
View File

@ -19,7 +19,7 @@ package org.apache.archiva.redback.rbac.cached;
* under the License.
*/
import org.apache.archiva.redback.components.cache.Cache;
import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACManager;

14
redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
View File

@ -31,7 +31,7 @@
<context:component-scan
base-package="org.apache.archiva.redback.rbac.cached"/>
<bean name="cache#operations" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
<bean name="cache#operations" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@ -42,7 +42,7 @@
<property name="timeToLiveSeconds" value="14400"/>
</bean>
<bean name="cache#permissions" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
<bean name="cache#permissions" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@ -53,7 +53,7 @@
<property name="timeToLiveSeconds" value="14400"/>
</bean>
<bean name="cache#resources" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
<bean name="cache#resources" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@ -64,7 +64,7 @@
<property name="timeToLiveSeconds" value="14400"/>
</bean>
<bean name="cache#roles" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
<bean name="cache#roles" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@ -75,7 +75,7 @@
<property name="timeToLiveSeconds" value="14400"/>
</bean>
<bean name="cache#effectiveRoleSet" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
<bean name="cache#effectiveRoleSet" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@ -90,7 +90,7 @@
Caches with Short Term entries
================================================================ -->
<bean name="cache#userAssignments" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
<bean name="cache#userAssignments" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@ -101,7 +101,7 @@
<property name="timeToLiveSeconds" value="600"/>
</bean>
<bean name="cache#userPermissions" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
<bean name="cache#userPermissions" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>

4
redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
View File

@ -51,7 +51,7 @@
<property name="userPermissionsCache" ref="cache#userPermissions"/>
</bean>
<bean name="cache#userAssignments" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
<bean name="cache#userAssignments" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@ -62,7 +62,7 @@
<property name="timeToLiveSeconds" value="600"/>
</bean>
<bean name="cache#userPermissions" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
<bean name="cache#userPermissions" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>

8
redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
View File

@ -47,12 +47,12 @@
<artifactId>redback-rbac-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-api</artifactId>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-ehcache</artifactId>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-ehcache</artifactId>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>

2
redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
View File

@ -25,7 +25,7 @@ import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.common.ldap.connection.LdapException;
import org.apache.archiva.redback.common.ldap.role.LdapRoleMapper;
import org.apache.archiva.redback.common.ldap.role.LdapRoleMapperConfiguration;
import org.apache.archiva.redback.components.cache.Cache;
import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.UserConfigurationKeys;
import org.apache.archiva.redback.rbac.AbstractRBACManager;

2
redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/resources/META-INF/spring-context.xml
View File

@ -31,7 +31,7 @@
<context:component-scan
base-package="org.apache.archiva.redback.rbac.ldap"/>
<bean name="cache#ldapRoles" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
<bean name="cache#ldapRoles" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>

4
redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
View File

@ -95,10 +95,10 @@
<property name="userPermissionsCache" ref="cache#userPermissions"/>
</bean>
<bean name="cache#userAssignments" class="org.apache.archiva.redback.components.cache.impl.NoCacheCache">
<bean name="cache#userAssignments" class="org.apache.archiva.components.cache.impl.NoCacheCache">
</bean>
<bean name="cache#userPermissions" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
<bean name="cache#userPermissions" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>

8
redback-users/redback-users-providers/redback-users-cached/pom.xml
View File

@ -39,12 +39,12 @@
<artifactId>redback-policy</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-api</artifactId>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-ehcache</artifactId>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.components.registry</groupId>

2
redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
View File

@ -19,7 +19,7 @@ package org.apache.archiva.redback.users.cached;
* under the License.
*/
import org.apache.archiva.redback.components.cache.Cache;
import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManagerException;
import org.apache.archiva.redback.users.UserManagerListener;

2
redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml
View File

@ -31,7 +31,7 @@
<context:component-scan
base-package="org.apache.archiva.redback.users.cached"/>
<bean name="cache#users" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
<bean name="cache#users" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>

2
redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
View File

@ -37,7 +37,7 @@
<alias name="userManager#memory" alias="userManager#configurable"/>
<bean name="cache#users" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
<bean name="cache#users" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>

8
redback-users/redback-users-providers/redback-users-ldap/pom.xml
View File

@ -52,12 +52,12 @@
<artifactId>spring-context-support</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-api</artifactId>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-ehcache</artifactId>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-ehcache</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>

2
redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java
View File

@ -20,7 +20,7 @@ package org.apache.archiva.redback.users.ldap.service;
*/
import org.apache.archiva.redback.common.ldap.user.LdapUser;
import org.apache.archiva.redback.components.cache.Cache;
import org.apache.archiva.components.cache.Cache;
import org.springframework.stereotype.Service;
import javax.inject.Inject;

4
redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
View File

@ -33,7 +33,7 @@
<!-- REDBACK-289/MRM-1488 -->
<!-- Cache for LDAP users. Data is refreshed every 3 mins. -->
<bean name="cache#ldapUser" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
<bean name="cache#ldapUser" class="org.apache.archiva.components.cache.ehcache.EhcacheCache">
<property name="diskExpiryThreadIntervalSeconds" value="180"/>
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@ -46,7 +46,7 @@
</bean>
<!-- Cache for users' LDAP userDn. Data is refreshed every 3 mins. -->
<bean name="cache#ldapUserDn" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
<bean name="cache#ldapUserDn" class="org.apache.archiva.components.cache.ehcache.EhcacheCache">
<property name="diskExpiryThreadIntervalSeconds" value="180"/>
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>