You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tv...@apache.org on 2023/11/02 18:47:59 UTC
(commons-jcs) 07/07: Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-jcs.git
This is an automated email from the ASF dual-hosted git repository.
tv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit 61109691d192d5bd942cee22e20c5c69ce83113b
Merge: 4df04900 76cca890
Author: Thomas Vandahl <tv...@apache.org>
AuthorDate: Thu Nov 2 19:47:33 2023 +0100
Merge branch 'master' of
https://gitbox.apache.org/repos/asf/commons-jcs.git
.github/workflows/codeql-analysis.yml | 8 ++--
.github/workflows/coverage.yml | 4 +-
.github/workflows/maven.yml | 10 ++--
.github/workflows/scorecards-analysis.yml | 6 +--
README.md | 2 +-
.../jcs/auxiliary/javagroups/JavaGroupsCache.java | 2 +-
.../javagroups/JavaGroupsCacheAttributes.java | 4 +-
.../javagroups/JavaGroupsCacheFactory.java | 2 +-
.../jcs/auxiliary/javagroups/JavaGroupsCache.java | 2 +-
.../javagroups/JavaGroupsCacheAttributes.java | 4 +-
.../javagroups/JavaGroupsCacheFactory.java | 2 +-
.../lateral/javagroups/LateralCacheJGListener.java | 2 +-
.../jcs/engine/memory/lru/LHMLRUMemoryCache.java | 2 -
checkstyle.xml | 1 +
commons-jcs3-core/pom.xml | 8 ++--
.../src/main/java/org/apache/commons/jcs3/JCS.java | 32 ++++++-------
.../apache/commons/jcs3/access/CacheAccess.java | 4 +-
.../commons/jcs3/access/behavior/ICacheAccess.java | 4 +-
.../commons/jcs3/auxiliary/AuxiliaryCache.java | 2 +-
.../jcs3/auxiliary/disk/AbstractDiskCache.java | 4 +-
.../disk/AbstractDiskCacheAttributes.java | 2 +-
.../jcs3/auxiliary/disk/PurgatoryElement.java | 2 +-
.../disk/behavior/IDiskCacheAttributes.java | 2 +-
.../jcs3/auxiliary/disk/block/BlockDiskCache.java | 6 +--
.../auxiliary/disk/block/BlockDiskKeyStore.java | 2 +-
.../auxiliary/disk/indexed/IndexedDiskCache.java | 6 +--
.../auxiliary/disk/jdbc/JDBCDiskCacheFactory.java | 4 +-
.../jcs3/auxiliary/lateral/LateralCacheNoWait.java | 2 +-
.../socket/tcp/TCPLateralCacheAttributes.java | 2 +-
.../remote/AbstractRemoteCacheNoWaitFacade.java | 2 +-
.../commons/jcs3/auxiliary/remote/RemoteCache.java | 4 +-
.../commons/jcs3/auxiliary/remote/RemoteUtils.java | 4 +-
.../remote/behavior/IRemoteCacheAttributes.java | 2 +-
.../remote/behavior/IRemoteCacheListener.java | 2 +-
.../http/client/RemoteHttpCacheAttributes.java | 2 +-
.../remote/http/server/RemoteHttpCacheServlet.java | 2 +-
.../auxiliary/remote/server/RemoteCacheServer.java | 2 +-
.../remote/server/RemoteCacheStartupServlet.java | 2 +-
.../auxiliary/remote/value/RemoteRequestType.java | 8 ++--
.../jcs3/engine/ZombieCacheServiceNonLocal.java | 10 ++--
.../engine/behavior/ICacheServiceNonLocal.java | 2 +-
.../jcs3/engine/behavior/IProvideScheduler.java | 2 +-
.../jcs3/engine/control/CompositeCache.java | 6 +--
.../engine/control/CompositeCacheConfigurator.java | 10 ++--
.../jcs3/engine/control/CompositeCacheManager.java | 56 ++++++++++++----------
.../jcs3/engine/memory/AbstractMemoryCache.java | 6 +--
.../jcs3/engine/memory/behavior/IMemoryCache.java | 8 ++--
.../memory/util/MemoryElementDescriptor.java | 2 +-
.../commons/jcs3/engine/stats/StatElement.java | 6 +--
.../jcs3/engine/stats/behavior/IStatElement.java | 6 +--
.../commons/jcs3/engine/stats/behavior/IStats.java | 6 +--
.../jcs3/io/ObjectInputStreamClassLoaderAware.java | 2 +-
.../org/apache/commons/jcs3/log/LogManager.java | 4 +-
.../commons/jcs3/utils/config/PropertySetter.java | 8 ++--
.../jcs3/utils/discovery/UDPDiscoveryService.java | 2 +-
.../utils/serialization/EncryptingSerializer.java | 4 +-
.../jcs3/utils/threadpool/ThreadPoolManager.java | 2 +-
commons-jcs3-core/src/test/conf/je.properties | 1 -
.../commons/jcs3/TestLogConfigurationUtil.java | 2 +-
.../IndexedDiskCacheDefragPerformanceTest.java | 2 +-
.../IndexedDiskCacheOptimizationUnitTest.java | 2 +-
.../jcs3/auxiliary/disk/jdbc/HsqlSetupUtil.java | 4 +-
.../auxiliary/remote/MockRemoteCacheService.java | 12 ++---
.../jcs3/engine/MockCacheServiceNonLocal.java | 12 ++---
.../memory/lru/LHMLRUMemoryCacheUnitTest.java | 2 +-
.../engine/memory/mru/MRUMemoryCacheUnitTest.java | 2 +-
.../UDPDiscoverySenderEncryptedUnitTest.java | 2 +-
.../discovery/UDPDiscoverySenderUnitTest.java | 2 +-
.../threadpool/ThreadPoolManagerUnitTest.java | 2 +-
commons-jcs3-dist/pom.xml | 4 +-
commons-jcs3-jcache-extras/pom.xml | 6 +--
.../jcache/extras/writer/AsyncCacheWriter.java | 2 +-
commons-jcs3-jcache-openjpa/pom.xml | 4 +-
commons-jcs3-jcache-tck/pom.xml | 4 +-
commons-jcs3-jcache/pom.xml | 4 +-
.../commons/jcs3/jcache/JCSCachingManager.java | 2 +-
.../jmx/ConfigurableMBeanServerIdBuilder.java | 4 +-
.../commons/jcs3/jcache/ExpiryListenerTest.java | 2 +-
.../commons-jcs3-filecache/pom.xml | 2 +-
.../jcs/auxiliary/disk/file/FileDiskCache.java | 20 ++++++--
.../disk/file/FileDiskCacheAttributes.java | 16 +++++++
.../auxiliary/disk/file/FileDiskCacheFactory.java | 16 +++++++
.../auxiliary/disk/file/FileDiskCacheManager.java | 18 ++++++-
.../commons/jcs/access/PartitionedCacheAccess.java | 2 +-
.../jcs/utils/props/AbstractPropertyContainer.java | 2 +-
commons-jcs3-sandbox/commons-jcs3-yajcache/pom.xml | 2 +-
commons-jcs3-sandbox/pom.xml | 2 +-
pom.xml | 10 ++--
src/changes/changes.xml | 23 ++++++---
.../http/server/LateralCacheServletReciever.java | 2 +-
.../socket/udp/LateralCacheUDPListener.java | 2 +-
.../lateral/xmlrpc/LateralCacheXMLRPCListener.java | 2 +-
.../xmlrpc/LateralXMLRPCReceiverConnection.java | 2 +-
.../jcs/engine/memory/arc/ARCMemoryCache.java | 14 +++---
xdocs/UpgradingFrom2x.xml | 2 +-
95 files changed, 297 insertions(+), 222 deletions(-)
diff --cc commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/behavior/IRemoteCacheListener.java
index 37055d1b,a2783d44..4086fab4
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/behavior/IRemoteCacheListener.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/behavior/IRemoteCacheListener.java
@@@ -116,7 -72,7 +116,7 @@@ public interface IRemoteCacheListener<K
throws IOException;
/**
-- * Deregistered itself.
++ * De-Registers itself.
* <p>
* @throws IOException
*/