inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-22 code enhance (#989)

Browse Source 
* ACS-22: changed naming in ticket related cache components

* ACS-22: dev release acs-22-1

* [maven-release-plugin][skip ci] prepare release alfresco-repository-acs-22-1

* [maven-release-plugin][skip ci] prepare for next development iteration

* Revert "ACS-22: dev release acs-22-1"

This reverts commit 4122bf56

* bump alfresco-data-model to 8.113

Co-authored-by: Travis CI User <build@alfresco.com>
This commit is contained in:
Mykhail-Diachenko
2020-05-14 15:11:19 +03:00
committed by GitHub
parent 0d2ee98502
commit cc9e78f152
5 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -36,7 +36,7 @@
<maven.build.sourceVersion>11</maven.build.sourceVersion> <maven.build.sourceVersion>11</maven.build.sourceVersion>
<dependency.alfresco-data-model.version>8.112</dependency.alfresco-data-model.version> <dependency.alfresco-data-model.version>8.113</dependency.alfresco-data-model.version>
<dependency.alfresco-core.version>8.33</dependency.alfresco-core.version> <dependency.alfresco-core.version>8.33</dependency.alfresco-core.version>
<dependency.alfresco-legacy-lucene.version>6.2</dependency.alfresco-legacy-lucene.version> <dependency.alfresco-legacy-lucene.version>6.2</dependency.alfresco-legacy-lucene.version>

4
src/main/resources/alfresco/authentication-services-context.xml
View File

@@ -598,8 +598,8 @@
<property name="ticketsCache"> <property name="ticketsCache">
<ref bean="ticketsCache" /> <ref bean="ticketsCache" />
</property> </property>
<property name="usernameKey"> <property name="usernameToTicketIdCache">
<ref bean="usernameKeyCache" /> <ref bean="usernameToTicketIdCache" />
</property> </property>
<!-- The period for which tickets are valid in XML duration format. --> <!-- The period for which tickets are valid in XML duration format. -->
<!-- The default is PT1H for one hour. --> <!-- The default is PT1H for one hour. -->

4
src/main/resources/alfresco/cache-context.xml
View File

@@ -281,8 +281,8 @@
<constructor-arg value="cache.ticketsCache"/> <constructor-arg value="cache.ticketsCache"/>
</bean> </bean>
<bean name="usernameKeyCache" factory-bean="cacheFactory" factory-method="createCache"> <bean name="usernameToTicketIdCache" factory-bean="cacheFactory" factory-method="createCache">
<constructor-arg value="cache.usernameKeyCache"/> <constructor-arg value="cache.usernameToTicketIdCache"/>
</bean> </bean>
<!-- ===================================== --> <!-- ===================================== -->

16
src/main/resources/alfresco/caches.properties
View File

@@ -333,14 +333,14 @@ cache.ticketsCache.eviction-policy=LRU
cache.ticketsCache.merge-policy=com.hazelcast.map.merge.PutIfAbsentMapMergePolicy cache.ticketsCache.merge-policy=com.hazelcast.map.merge.PutIfAbsentMapMergePolicy
cache.ticketsCache.readBackupData=false cache.ticketsCache.readBackupData=false
cache.usernameKeyCache.maxItems=1000 cache.usernameToTicketIdCache.maxItems=1000
cache.usernameKeyCache.timeToLiveSeconds=0 cache.usernameToTicketIdCache.timeToLiveSeconds=0
cache.usernameKeyCache.maxIdleSeconds=0 cache.usernameToTicketIdCache.maxIdleSeconds=0
cache.usernameKeyCache.cluster.type=fully-distributed cache.usernameToTicketIdCache.cluster.type=fully-distributed
cache.usernameKeyCache.backup-count=1 cache.usernameToTicketIdCache.backup-count=1
cache.usernameKeyCache.eviction-policy=LRU cache.usernameToTicketIdCache.eviction-policy=LRU
cache.usernameKeyCache.merge-policy=com.hazelcast.map.merge.PutIfAbsentMapMergePolicy cache.usernameToTicketIdCache.merge-policy=com.hazelcast.map.merge.PutIfAbsentMapMergePolicy
cache.usernameKeyCache.readBackupData=false cache.usernameToTicketIdCache.readBackupData=false
cache.authorityEntitySharedCache.tx.maxItems=50000 cache.authorityEntitySharedCache.tx.maxItems=50000
cache.authorityEntitySharedCache.tx.statsEnabled=${caches.tx.statsEnabled} cache.authorityEntitySharedCache.tx.statsEnabled=${caches.tx.statsEnabled}

19
src/test/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
View File

@@ -54,7 +54,6 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.admin.SysAdminParamsImpl; import org.alfresco.repo.admin.SysAdminParamsImpl;
import org.alfresco.repo.cache.SimpleCache; import org.alfresco.repo.cache.SimpleCache;
import org.alfresco.repo.domain.dialect.Dialect; import org.alfresco.repo.domain.dialect.Dialect;
import org.alfresco.repo.domain.dialect.PostgreSQLDialect;
import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory; import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
import org.alfresco.repo.management.subsystems.ChildApplicationContextManager; import org.alfresco.repo.management.subsystems.ChildApplicationContextManager;
import org.alfresco.repo.policy.BehaviourFilter; import org.alfresco.repo.policy.BehaviourFilter;
@@ -103,7 +102,7 @@ public class AuthenticationTest extends TestCase
private AuthenticationManager authenticationManager; private AuthenticationManager authenticationManager;
private TicketComponent ticketComponent; private TicketComponent ticketComponent;
private SimpleCache<String, Ticket> ticketsCache; private SimpleCache<String, Ticket> ticketsCache;
private SimpleCache<String, String> usernameKey; private SimpleCache<String, String> usernameToTicketIdCache;
private MutableAuthenticationService authenticationService; private MutableAuthenticationService authenticationService;
private MutableAuthenticationService pubAuthenticationService; private MutableAuthenticationService pubAuthenticationService;
private AuthenticationComponent authenticationComponent; private AuthenticationComponent authenticationComponent;
@@ -174,7 +173,7 @@ public class AuthenticationTest extends TestCase
// permissionServiceSPI = (PermissionServiceSPI) // permissionServiceSPI = (PermissionServiceSPI)
// ctx.getBean("permissionService"); // ctx.getBean("permissionService");
ticketsCache = (SimpleCache<String, Ticket>) ctx.getBean("ticketsCache"); ticketsCache = (SimpleCache<String, Ticket>) ctx.getBean("ticketsCache");
usernameKey = (SimpleCache<String, String>) ctx.getBean("usernameKeyCache"); usernameToTicketIdCache = (SimpleCache<String, String>) ctx.getBean("usernameToTicketIdCache");
ChildApplicationContextFactory sysAdminSubsystem = (ChildApplicationContextFactory) ctx.getBean("sysAdmin"); ChildApplicationContextFactory sysAdminSubsystem = (ChildApplicationContextFactory) ctx.getBean("sysAdmin");
assertNotNull("sysAdminSubsystem", sysAdminSubsystem); assertNotNull("sysAdminSubsystem", sysAdminSubsystem);
@@ -831,7 +830,7 @@ public class AuthenticationTest extends TestCase
tc.setTicketsExpire(false); tc.setTicketsExpire(false);
tc.setValidDuration("P0D"); tc.setValidDuration("P0D");
tc.setTicketsCache(ticketsCache); tc.setTicketsCache(ticketsCache);
tc.setUsernameKey(usernameKey); tc.setUsernameToTicketIdCache(usernameToTicketIdCache);
dao.createUser("Andy", "ticket".toCharArray()); dao.createUser("Andy", "ticket".toCharArray());
@@ -858,7 +857,7 @@ public class AuthenticationTest extends TestCase
tc.setTicketsExpire(false); tc.setTicketsExpire(false);
tc.setValidDuration("P0D"); tc.setValidDuration("P0D");
tc.setTicketsCache(ticketsCache); tc.setTicketsCache(ticketsCache);
tc.setUsernameKey(usernameKey); tc.setUsernameToTicketIdCache(usernameToTicketIdCache);
dao.createUser("Andy", "ticket".toCharArray()); dao.createUser("Andy", "ticket".toCharArray());
@@ -888,14 +887,14 @@ public class AuthenticationTest extends TestCase
public void testTicketExpiryMode() public void testTicketExpiryMode()
{ {
ticketsCache.clear(); ticketsCache.clear();
usernameKey.clear(); usernameToTicketIdCache.clear();
InMemoryTicketComponentImpl tc = new InMemoryTicketComponentImpl(); InMemoryTicketComponentImpl tc = new InMemoryTicketComponentImpl();
tc.setOneOff(false); tc.setOneOff(false);
tc.setTicketsExpire(true); tc.setTicketsExpire(true);
tc.setValidDuration("P5S"); tc.setValidDuration("P5S");
tc.setTicketsCache(ticketsCache); tc.setTicketsCache(ticketsCache);
tc.setUsernameKey(usernameKey); tc.setUsernameToTicketIdCache(usernameToTicketIdCache);
tc.setExpiryMode(ExpiryMode.AFTER_FIXED_TIME.toString()); tc.setExpiryMode(ExpiryMode.AFTER_FIXED_TIME.toString());
dao.createUser("Andy", "ticket".toCharArray()); dao.createUser("Andy", "ticket".toCharArray());
@@ -1033,13 +1032,13 @@ public class AuthenticationTest extends TestCase
public void testTicketExpires() public void testTicketExpires()
{ {
ticketsCache.clear(); ticketsCache.clear();
usernameKey.clear(); usernameToTicketIdCache.clear();
InMemoryTicketComponentImpl tc = new InMemoryTicketComponentImpl(); InMemoryTicketComponentImpl tc = new InMemoryTicketComponentImpl();
tc.setOneOff(false); tc.setOneOff(false);
tc.setTicketsExpire(true); tc.setTicketsExpire(true);
tc.setValidDuration("P5S"); tc.setValidDuration("P5S");
tc.setTicketsCache(ticketsCache); tc.setTicketsCache(ticketsCache);
tc.setUsernameKey(usernameKey); tc.setUsernameToTicketIdCache(usernameToTicketIdCache);
dao.createUser("Andy", "ticket".toCharArray()); dao.createUser("Andy", "ticket".toCharArray());
@@ -1133,7 +1132,7 @@ public class AuthenticationTest extends TestCase
tc.setTicketsExpire(true); tc.setTicketsExpire(true);
tc.setValidDuration("P1D"); tc.setValidDuration("P1D");
tc.setTicketsCache(ticketsCache); tc.setTicketsCache(ticketsCache);
tc.setUsernameKey(usernameKey); tc.setUsernameToTicketIdCache(usernameToTicketIdCache);
dao.createUser("Andy", "ticket".toCharArray()); dao.createUser("Andy", "ticket".toCharArray());