Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5E7B5CEA0 for ; Wed, 30 May 2012 18:15:46 +0000 (UTC) Received: (qmail 89048 invoked by uid 500); 30 May 2012 18:15:46 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 88928 invoked by uid 500); 30 May 2012 18:15:45 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 88847 invoked by uid 99); 30 May 2012 18:15:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 May 2012 18:15:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 May 2012 18:15:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A13932388847 for ; Wed, 30 May 2012 18:15:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1344374 [1/14] - in /commons/proper/jcs/trunk: ./ auxiliary-builds/javagroups/src/java/org/apache/jcs/auxiliary/javagroups/ auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/javagroups/ auxiliary-builds/jdk14/src/java/org/apache/jcs... Date: Wed, 30 May 2012 18:14:51 -0000 To: commits@commons.apache.org From: tv@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120530181505.A13932388847@eris.apache.org> Author: tv Date: Wed May 30 18:14:43 2012 New Revision: 1344374 URL: http://svn.apache.org/viewvc?rev=1344374&view=rev Log: Merged in http://svn.apache.org/repos/asf/commons/proper/jcs/branches/generics-interface Development continues in trunk Modified: commons/proper/jcs/trunk/ (props changed) commons/proper/jcs/trunk/auxiliary-builds/javagroups/src/java/org/apache/jcs/auxiliary/javagroups/JavaGroupsCache.java commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/javagroups/JavaGroupsCache.java commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGReceiverConnection.java commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGSender.java commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGService.java commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/behavior/ILateralCacheJGListener.java commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCache.java commons/proper/jcs/trunk/build-gump.xml commons/proper/jcs/trunk/build.xml commons/proper/jcs/trunk/gump.xml commons/proper/jcs/trunk/m2-deploy.sh commons/proper/jcs/trunk/maven.xml commons/proper/jcs/trunk/maven13.bat commons/proper/jcs/trunk/maven131.bat commons/proper/jcs/trunk/maven14.bat commons/proper/jcs/trunk/pom.xml commons/proper/jcs/trunk/project-b4.xml commons/proper/jcs/trunk/project.properties commons/proper/jcs/trunk/project.xml commons/proper/jcs/trunk/src/changes/changes.xml commons/proper/jcs/trunk/src/experimental/org/apache/jcs/auxiliary/lateral/http/broadcast/LateralCacheMulticaster.java commons/proper/jcs/trunk/src/experimental/org/apache/jcs/auxiliary/lateral/http/broadcast/LateralCacheThread.java commons/proper/jcs/trunk/src/experimental/org/apache/jcs/auxiliary/lateral/http/broadcast/LateralCacheUnicaster.java commons/proper/jcs/trunk/src/experimental/org/apache/jcs/auxiliary/lateral/http/server/LateralCacheServletReciever.java commons/proper/jcs/trunk/src/experimental/org/apache/jcs/auxiliary/lateral/socket/udp/LateralCacheUDPListener.java commons/proper/jcs/trunk/src/experimental/org/apache/jcs/auxiliary/lateral/socket/udp/LateralGroupCacheUDPListener.java commons/proper/jcs/trunk/src/experimental/org/apache/jcs/auxiliary/lateral/socket/udp/LateralUDPSender.java commons/proper/jcs/trunk/src/experimental/org/apache/jcs/auxiliary/lateral/socket/udp/LateralUDPService.java commons/proper/jcs/trunk/src/experimental/org/apache/jcs/auxiliary/lateral/xmlrpc/LateralCacheXMLRPCListener.java commons/proper/jcs/trunk/src/experimental/org/apache/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCReceiverConnection.java commons/proper/jcs/trunk/src/experimental/org/apache/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCSender.java commons/proper/jcs/trunk/src/experimental/org/apache/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCService.java commons/proper/jcs/trunk/src/experimental/org/apache/jcs/auxiliary/lateral/xmlrpc/behavior/ILateralCacheXMLRPCListener.java commons/proper/jcs/trunk/src/experimental/org/apache/jcs/engine/memory/arc/ARCMemoryCache.java commons/proper/jcs/trunk/src/experimental/org/apache/jcs/engine/memory/arc/ARCMemoryCacheUnitTest.java commons/proper/jcs/trunk/src/java/org/apache/jcs/JCS.java commons/proper/jcs/trunk/src/java/org/apache/jcs/access/CacheAccess.java commons/proper/jcs/trunk/src/java/org/apache/jcs/access/GroupCacheAccess.java commons/proper/jcs/trunk/src/java/org/apache/jcs/access/PartitionedCacheAccess.java commons/proper/jcs/trunk/src/java/org/apache/jcs/access/behavior/ICacheAccess.java commons/proper/jcs/trunk/src/java/org/apache/jcs/access/behavior/IGroupCacheAccess.java commons/proper/jcs/trunk/src/java/org/apache/jcs/admin/CacheRegionInfo.java commons/proper/jcs/trunk/src/java/org/apache/jcs/admin/JCSAdminBean.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/AbstractAuxiliaryCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/AbstractAuxiliaryCacheEventLogging.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/AuxiliaryCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/AuxiliaryCacheFactory.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/AuxiliaryCacheManager.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/AbstractDiskCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/PurgatoryElement.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/block/BlockDiskCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/block/BlockDiskCacheFactory.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/block/BlockDiskCacheManager.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/block/BlockDiskElementDescriptor.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/block/BlockDiskKeyStore.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/file/FileDiskCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/file/FileDiskCacheFactory.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/file/FileDiskCacheManager.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCacheManager.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskDumper.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManager.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManagerAbstractTemplate.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/jdbc/ShrinkerThread.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheManager.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAbstractFactory.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAbstractManager.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheNoWait.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralElementDescriptor.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/ZombieLateralCacheService.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/behavior/ILateralCacheListener.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/behavior/ILateralCacheManager.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/behavior/ILateralCacheService.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheManager.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/AbsractRemoteCacheListener.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheFactory.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheListener.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheManager.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheNoWait.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/ZombieRemoteCacheService.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/behavior/IRemoteCacheClient.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/behavior/IRemoteCacheDispatcher.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/behavior/IRemoteCacheListener.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/behavior/IRemoteCacheService.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/http/client/RemoteHttpCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/http/client/RemoteHttpCacheClient.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/http/client/RemoteHttpCacheManager.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/http/client/RemoteHttpClientListener.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/http/client/behavior/IRemoteHttpCacheClient.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/http/server/AbstractRemoteCacheService.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/http/server/RemoteCacheServiceAdaptor.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/http/server/RemoteHttpCacheService.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/http/server/RemoteHttpCacheSeviceFactory.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServer.java commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/util/RemoteCacheRequestFactory.java (contents, props changed) commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/value/RemoteCacheRequest.java (contents, props changed) commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/value/RemoteCacheResponse.java (contents, props changed) commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/AbstractCacheEventQueue.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/CacheAdaptor.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/CacheElement.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/CacheElementSerialized.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/CacheEventQueue.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/CacheEventQueueFactory.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/CacheListeners.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/CacheWatchRepairable.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/PooledCacheEventQueue.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/ZombieCacheService.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/ZombieCacheServiceNonLocal.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/ZombieCacheWatch.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheElement.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheElementSerialized.java (contents, props changed) commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheEventQueue.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheListener.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheManager.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheObserver.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheService.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheServiceNonLocal.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheManager.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IElementSerializer.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCacheConfigurator.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCacheManager.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/control/group/GroupAttrName.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/logging/CacheEvent.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/logging/CacheEventLoggerDebugLogger.java (contents, props changed) commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/logging/behavior/ICacheEvent.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/logging/behavior/ICacheEventLogger.java (contents, props changed) commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/match/KeyMatcherPatternImpl.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/match/behavior/IKeyMatcher.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/memory/AbstractDoulbeLinkedListMemoryCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/memory/AbstractMemoryCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/memory/MemoryCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/memory/behavior/IMemoryCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/memory/fifo/FIFOMemoryCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/memory/lru/LRUMemoryCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/memory/mru/MRUMemoryCache.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/memory/shrinking/ShrinkerThread.java commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/memory/util/MemoryElementDescriptor.java commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/access/JCSWorker.java commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/config/OptionConverter.java (props changed) commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/config/PropertySetter.java (props changed) commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/config/PropertySetterException.java (props changed) commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/config/package.html (props changed) commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/discovery/UDPDiscoveryManager.java (props changed) commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/discovery/UDPDiscoveryMessage.java (props changed) commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/discovery/UDPDiscoveryReceiver.java (contents, props changed) commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/discovery/UDPDiscoverySender.java (props changed) commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/discovery/UDPDiscoverySenderThread.java (props changed) commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/discovery/UDPDiscoveryService.java (props changed) commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/serialization/CompressingSerializer.java commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/serialization/SerializationConversionUtil.java commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/serialization/StandardSerializer.java commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/struct/LRUMap.java commons/proper/jcs/trunk/src/test/org/apache/jcs/JCSCacheElementRetrievalUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/JCSLightLoadUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/JCSRemovalSimpleConcurrentTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/JCSThrashTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/JCSUnitTest.java (contents, props changed) commons/proper/jcs/trunk/src/test/org/apache/jcs/JCSvsHashtablePerformanceTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/RemovalTestUtil.java commons/proper/jcs/trunk/src/test/org/apache/jcs/TestTCPLateralCache.java commons/proper/jcs/trunk/src/test/org/apache/jcs/ZeroSizeCacheUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/access/CacheAccessUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/access/SystemPropetyUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/access/TestCacheAccess.java commons/proper/jcs/trunk/src/test/org/apache/jcs/admin/AdminBeanUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/MockAuxiliaryCache.java (contents, props changed) commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/MockAuxiliaryCacheFactory.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/MockCacheEventLogger.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/AbstractDiskCacheUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/LRUMapJCSUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/PurgatoryElementUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/block/BlockDiskCacheConcurrentUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/block/BlockDiskCacheKeyStoreUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/block/BlockDiskCacheManagerUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/block/BlockDiskCacheSameRegionConcurrentUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/block/BlockDiskCacheSteadyLoadTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/block/BlockDiskCacheUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/block/BlockDiskElementDescriptorUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/block/BlockDiskUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/block/HugeQuantityBlockDiskCacheLoadTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/file/FileDiskCacheFactoryUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/file/FileDiskCacheUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/indexed/DiskTestObjectUtil.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/indexed/HugeQuantityIndDiskCacheLoadTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/indexed/IndexDiskCacheUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCacheConcurrentUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCacheDefragPerformanceTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCacheKeyStoreUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCacheManagerUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCacheNoMemoryUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCacheRandomConcurrentTestUtil.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCacheSameRegionConcurrentUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCacheSteadyLoadTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManagerUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/jdbc/JDBCDiskCacheSharedPoolUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/jdbc/JDBCDiskCacheUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheConcurrentUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheManagerUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/lateral/LateralCacheNoWaitFacadeUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListenerUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPIssueRemoveOnPutUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/lateral/socket/tcp/MockLateralCache.java (contents, props changed) commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/lateral/socket/tcp/TestTCPLateralUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/MockRemoteCacheClient.java (contents, props changed) commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/MockRemoteCacheListener.java (contents, props changed) commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/MockRemoteCacheService.java (contents, props changed) commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/RemoteCacheClientTester.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/RemoteCacheListenerUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/RemoteCacheNoWaitUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/RemoteCacheUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/TestRemoteCache.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/ZombieRemoteCacheServiceUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/http/client/RemoteHttpCacheClientUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/http/client/RemoteHttpCacheManagerUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/http/client/RemoteHttpCacheManualTester.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/http/server/RemoteCacheServiceAdaptorUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/http/server/RemoteHttpCacheServiceUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/http/server/RemoteHttpCacheSeviceFactoryUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/util/RemoteCacheRequestFactoryUnitTest.java (contents, props changed) commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/CacheEventQueueFactoryUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/EventQueueConcurrentLoadTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/MockCacheEventQueue.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/MockCacheServiceNonLocal.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/SystemPropertyUsageUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/ZombieCacheServiceNonLocalUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/control/CacheManagerStatsUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/control/CompositeCacheConfiguratorUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/control/CompositeCacheUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/control/MockCompositeCacheManager.java (contents, props changed) commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/control/MockElementSerializer.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/control/event/SimpleEventHandlingUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/logging/CacheEventLoggerDebugLoggerUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/logging/MockCacheEventLogger.java (contents, props changed) commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/match/KeyMatcherPatternImpllUnitTest.java (contents, props changed) commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/memory/MockMemoryCache.java (contents, props changed) commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/memory/fifo/FIFOMemoryCacheUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCacheConcurrentUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCacheUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/memory/lru/LRUMemoryCacheConcurrentUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/memory/mru/LRUvsMRUPerformanceTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/memory/mru/MRUMemoryCacheUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/engine/memory/shrinking/ShrinkerThreadUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/utils/access/JCSWorkerUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/utils/discovery/UDPDiscoverySenderUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/utils/discovery/UDPDiscoveryUnitTest.java (props changed) commons/proper/jcs/trunk/src/test/org/apache/jcs/utils/serialization/SerializationConversionUtilUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/utils/struct/LRUMapConcurrentTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/utils/struct/LRUMapConcurrentUnitTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/utils/struct/LRUMapPerformanceTest.java commons/proper/jcs/trunk/src/test/org/apache/jcs/utils/struct/LRUMapUnitTest.java Propchange: commons/proper/jcs/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed May 30 18:14:43 2012 @@ -0,0 +1 @@ +/commons/proper/jcs/branches/generics-interface:1232160-1344358 Modified: commons/proper/jcs/trunk/auxiliary-builds/javagroups/src/java/org/apache/jcs/auxiliary/javagroups/JavaGroupsCache.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/auxiliary-builds/javagroups/src/java/org/apache/jcs/auxiliary/javagroups/JavaGroupsCache.java?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/auxiliary-builds/javagroups/src/java/org/apache/jcs/auxiliary/javagroups/JavaGroupsCache.java (original) +++ commons/proper/jcs/trunk/auxiliary-builds/javagroups/src/java/org/apache/jcs/auxiliary/javagroups/JavaGroupsCache.java Wed May 30 18:14:43 2012 @@ -109,7 +109,7 @@ public class JavaGroupsCache log.info( "Initialized for cache: " + cacheName ); } - public void send( ICacheElement element, int command ) + public void send( ICacheElement element, int command ) { Request request = new Request( element, command ); @@ -136,7 +136,7 @@ public class JavaGroupsCache * @param ce CacheElement to replicate * @throws IOException Never thrown by this implementation */ - public void update( ICacheElement ce ) throws IOException + public void update( ICacheElement ce ) throws IOException { send( ce, Request.UPDATE ); } @@ -149,7 +149,7 @@ public class JavaGroupsCache * @return * @throws IOException Never thrown by this implementation */ - public ICacheElement get( Serializable key ) throws IOException + public ICacheElement get( K key ) throws IOException { if ( getFromPeers ) { @@ -176,7 +176,7 @@ public class JavaGroupsCache if ( results.size() > 0 ) { - return ( ICacheElement ) results.get( 0 ); + return ( ICacheElement ) results.get( 0 ); } } @@ -190,7 +190,7 @@ public class JavaGroupsCache * @param key Key of element to be removed * @throws IOException Never thrown by this implementation */ - public boolean remove( Serializable key ) throws IOException + public boolean remove( K key ) throws IOException { CacheElement ce = new CacheElement( cacheName, key, null ); @@ -270,7 +270,7 @@ public class JavaGroupsCache * @param group Ignored * @return Always reurns null */ - public Set getGroupKeys( String group ) + public Set getGroupKeys( String group ) { return null; } @@ -365,16 +365,16 @@ public class JavaGroupsCache public final static int REMOVE_ALL = 3; public final static int GET = 5; - private ICacheElement cacheElement; + private ICacheElement cacheElement; private int command; - public Request( ICacheElement cacheElement, int command ) + public Request( ICacheElement cacheElement, int command ) { this.cacheElement = cacheElement; this.command = command; } - public ICacheElement getCacheElement() + public ICacheElement getCacheElement() { return cacheElement; } Modified: commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/javagroups/JavaGroupsCache.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/javagroups/JavaGroupsCache.java?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/javagroups/JavaGroupsCache.java (original) +++ commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/javagroups/JavaGroupsCache.java Wed May 30 18:14:43 2012 @@ -115,7 +115,7 @@ public class JavaGroupsCache log.info( "Initialized for cache: " + cacheName ); } - public void send( ICacheElement element, int command ) + public void send( ICacheElement element, int command ) { Request request = new Request( element, command ); @@ -141,7 +141,7 @@ public class JavaGroupsCache * @throws IOException * Never thrown by this implementation */ - public void update( ICacheElement ce ) + public void update( ICacheElement ce ) throws IOException { send( ce, Request.UPDATE ); @@ -156,7 +156,7 @@ public class JavaGroupsCache * @throws IOException * Never thrown by this implementation */ - public ICacheElement get( Serializable key ) + public ICacheElement get( K key ) throws IOException { if ( getFromPeers ) @@ -197,7 +197,7 @@ public class JavaGroupsCache * @throws IOException * Never thrown by this implementation */ - public boolean remove( Serializable key ) + public boolean remove( K key ) throws IOException { CacheElement ce = new CacheElement( cacheName, key, null ); @@ -282,7 +282,7 @@ public class JavaGroupsCache * Ignored * @return Always reurns null */ - public Set getGroupKeys( String group ) + public Set getGroupKeys( String group ) { return null; } @@ -430,17 +430,17 @@ public class JavaGroupsCache public final static int GET = 5; - private ICacheElement cacheElement; + private ICacheElement cacheElement; private int command; - public Request( ICacheElement cacheElement, int command ) + public Request( ICacheElement cacheElement, int command ) { this.cacheElement = cacheElement; this.command = command; } - public ICacheElement getCacheElement() + public ICacheElement getCacheElement() { return cacheElement; } Modified: commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java (original) +++ commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java Wed May 30 18:14:43 2012 @@ -171,7 +171,7 @@ public class LateralCacheJGListener * @param cb * @exception IOException */ - public void handlePut( ICacheElement element ) + public void handlePut( ICacheElement element ) throws IOException { if ( log.isDebugEnabled() ) @@ -199,7 +199,7 @@ public class LateralCacheJGListener * @param key * @exception IOException */ - public void handleRemove( String cacheName, Serializable key ) + public void handleRemove( String cacheName, K key ) throws IOException { if ( log.isDebugEnabled() ) @@ -236,7 +236,7 @@ public class LateralCacheJGListener * @param key * @exception IOException */ - public Serializable handleGet( String cacheName, Serializable key ) + public Serializable handleGet( String cacheName, K key ) throws IOException { if ( log.isDebugEnabled() ) Modified: commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGReceiverConnection.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGReceiverConnection.java?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGReceiverConnection.java (original) +++ commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGReceiverConnection.java Wed May 30 18:14:43 2012 @@ -127,7 +127,7 @@ public class LateralJGReceiverConnection * @param key * @exception Exception */ - private Serializable getAndRespond( String cacheName, Serializable key ) + private Serializable getAndRespond( String cacheName, K key ) throws Exception { Serializable obj = ilcl.handleGet( cacheName, key ); Modified: commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGSender.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGSender.java?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGSender.java (original) +++ commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGSender.java Wed May 30 18:14:43 2012 @@ -151,10 +151,10 @@ public class LateralJGSender * @param led * @exception IOException */ - public ICacheElement sendAndReceive( LateralElementDescriptor led ) + public ICacheElement sendAndReceive( LateralElementDescriptor led ) throws IOException { - ICacheElement ice = null; + ICacheElement ice = null; log.debug( "SendAndReceive led" ); @@ -213,7 +213,7 @@ public class LateralJGSender * @param requesterId * @exception IOException */ - public void update( ICacheElement item, long requesterId ) + public void update( ICacheElement item, long requesterId ) throws IOException { LateralElementDescriptor led = new LateralElementDescriptor( item ); @@ -229,7 +229,7 @@ public class LateralJGSender * @param key * @exception IOException */ - public void remove( String cacheName, Serializable key ) + public void remove( String cacheName, K key ) throws IOException { remove( cacheName, key, LateralCacheInfo.listenerId ); @@ -243,7 +243,7 @@ public class LateralJGSender * @param requesterId * @exception IOException */ - public void remove( String cacheName, Serializable key, long requesterId ) + public void remove( String cacheName, K key, long requesterId ) throws IOException { CacheElement ce = new CacheElement( cacheName, key, null ); Modified: commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGService.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGService.java?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGService.java (original) +++ commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGService.java Wed May 30 18:14:43 2012 @@ -85,7 +85,7 @@ public class LateralJGService * @param item * @exception IOException */ - public void update( ICacheElement item ) + public void update( ICacheElement item ) throws IOException { update( item, LateralCacheInfo.listenerId ); @@ -96,7 +96,7 @@ public class LateralJGService * @param requesterId * @exception IOException */ - public void update( ICacheElement item, long requesterId ) + public void update( ICacheElement item, long requesterId ) throws IOException { LateralElementDescriptor led = new LateralElementDescriptor( item ); @@ -110,7 +110,7 @@ public class LateralJGService * @param key * @exception IOException */ - public void remove( String cacheName, Serializable key ) + public void remove( String cacheName, K key ) throws IOException { remove( cacheName, key, LateralCacheInfo.listenerId ); @@ -122,7 +122,7 @@ public class LateralJGService * @param requesterId * @exception IOException */ - public void remove( String cacheName, Serializable key, long requesterId ) + public void remove( String cacheName, K key, long requesterId ) throws IOException { CacheElement ce = new CacheElement( cacheName, key, null ); @@ -159,7 +159,7 @@ public class LateralJGService * @param key * @exception IOException */ - public ICacheElement get( String cacheName, Serializable key ) + public ICacheElement get( String cacheName, K key ) throws IOException { //p( "get(cacheName,key,container)" ); @@ -201,7 +201,7 @@ public class LateralJGService * Gets the set of keys of objects currently in the group throws * UnsupportedOperationException */ - public Set getGroupKeys( String cacheName, String group ) + public Set getGroupKeys( String cacheName, String group ) { if ( true ) { Modified: commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/behavior/ILateralCacheJGListener.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/behavior/ILateralCacheJGListener.java?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/behavior/ILateralCacheJGListener.java (original) +++ commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/auxiliary/lateral/javagroups/behavior/ILateralCacheJGListener.java Wed May 30 18:14:43 2012 @@ -37,7 +37,7 @@ public interface ILateralCacheJGListener public void init(); /** Tries to get a requested item from the cache. */ - public Serializable handleGet( String cacheName, Serializable key ) + public Serializable handleGet( String cacheName, K key ) throws IOException; } Modified: commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCache.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCache.java?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCache.java (original) +++ commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCache.java Wed May 30 18:14:43 2012 @@ -72,7 +72,7 @@ public class LHMLRUMemoryCache *@param ce Description of the Parameter *@exception IOException */ - public void update(ICacheElement ce) throws IOException + public void update(ICacheElement ce) throws IOException { // Asynchronisly create a MemoryElement ce.getElementAttributes().setLastAccessTimeNow(); @@ -96,9 +96,9 @@ public class LHMLRUMemoryCache *@return Element mathinh key if found, or null *@exception IOException */ - public ICacheElement getQuiet(Serializable key) throws IOException + public ICacheElement getQuiet(K key) throws IOException { - ICacheElement ce = null; + ICacheElement ce = null; ce = (ICacheElement) map.get(key); @@ -122,12 +122,12 @@ public class LHMLRUMemoryCache * Get an item from the cache * *@param key Identifies item to find - *@return ICacheElement if found, else null + *@return ICacheElement if found, else null *@exception IOException */ - public synchronized ICacheElement get(Serializable key) throws IOException + public synchronized ICacheElement get(K key) throws IOException { - ICacheElement ce = null; + ICacheElement ce = null; if (log.isDebugEnabled()) { @@ -163,7 +163,7 @@ public class LHMLRUMemoryCache *@return *@exception IOException */ - public synchronized boolean remove(Serializable key) throws IOException + public synchronized boolean remove(K key) throws IOException { if (log.isDebugEnabled()) { @@ -217,7 +217,7 @@ public class LHMLRUMemoryCache else { // remove single item. - ICacheElement ce = (ICacheElement) map.remove(key); + ICacheElement ce = (ICacheElement) map.remove(key); removed = true; } Modified: commons/proper/jcs/trunk/build-gump.xml URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/build-gump.xml?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/build-gump.xml (original) +++ commons/proper/jcs/trunk/build-gump.xml Wed May 30 18:14:43 2012 @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - Modified: commons/proper/jcs/trunk/build.xml URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/build.xml?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/build.xml (original) +++ commons/proper/jcs/trunk/build.xml Wed May 30 18:14:43 2012 @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Modified: commons/proper/jcs/trunk/gump.xml URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/gump.xml?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/gump.xml (original) +++ commons/proper/jcs/trunk/gump.xml Wed May 30 18:14:43 2012 @@ -1,68 +0,0 @@ - - - - - - Cache - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Modified: commons/proper/jcs/trunk/m2-deploy.sh URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/m2-deploy.sh?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/m2-deploy.sh (original) +++ commons/proper/jcs/trunk/m2-deploy.sh Wed May 30 18:14:43 2012 @@ -1,2 +0,0 @@ -#!/bin/sh -mvn -Dfile=target/jcs-1.3.jar -DrepositoryId=apache.releases -DpomFile=pom.xml -Durl=scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository -Dpackaging=jar deploy:deploy-file Modified: commons/proper/jcs/trunk/maven.xml URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/maven.xml?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/maven.xml (original) +++ commons/proper/jcs/trunk/maven.xml Wed May 30 18:14:43 2012 @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Not generating the .project file. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Modified: commons/proper/jcs/trunk/maven13.bat URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/maven13.bat?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== Binary files - no diff available. Modified: commons/proper/jcs/trunk/maven131.bat URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/maven131.bat?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/maven131.bat (original) +++ commons/proper/jcs/trunk/maven131.bat Wed May 30 18:14:43 2012 @@ -1,19 +0,0 @@ -rem Licensed to the Apache Software Foundation (ASF) under one -rem or more contributor license agreements. See the NOTICE file -rem distributed with this work for additional information -rem regarding copyright ownership. The ASF licenses this file -rem to you under the Apache License, Version 2.0 (the -rem "License"); you may not use this file except in compliance -rem with the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, -rem software distributed under the License is distributed on an -rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -rem KIND, either express or implied. See the License for the -rem specific language governing permissions and limitations -rem under the License. -set JAVA_HOME=C:\Java\jdk1.3.1 - -maven %1 %2 Modified: commons/proper/jcs/trunk/maven14.bat URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/maven14.bat?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/maven14.bat (original) +++ commons/proper/jcs/trunk/maven14.bat Wed May 30 18:14:43 2012 @@ -1,19 +0,0 @@ -rem Licensed to the Apache Software Foundation (ASF) under one -rem or more contributor license agreements. See the NOTICE file -rem distributed with this work for additional information -rem regarding copyright ownership. The ASF licenses this file -rem to you under the Apache License, Version 2.0 (the -rem "License"); you may not use this file except in compliance -rem with the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, -rem software distributed under the License is distributed on an -rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -rem KIND, either express or implied. See the License for the -rem specific language governing permissions and limitations -rem under the License. -set JAVA_HOME=C:\java\j2sdk1.4.2_18 - -maven %1 %2 Modified: commons/proper/jcs/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/pom.xml?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/pom.xml (original) +++ commons/proper/jcs/trunk/pom.xml Wed May 30 18:14:43 2012 @@ -22,8 +22,8 @@ 4.0.0 org.apache.commons - commons-parent - 21 + commons-parent + 21 org.apache.jcs jcs @@ -121,7 +121,6 @@ true - @@ -232,7 +232,7 @@ + ${maven.compile.source} - - - org.apache.maven.plugins - maven-jar-plugin - - - - ${project.name} - ${project.version} - ${project.organization.name} - ${project.name} - ${project.version} - ${project.organization.name} - org.apache - ${maven.compile.source} - ${maven.compile.source} - - - - + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.2 + + + + ${project.name} + ${project.version} + ${project.organization.name} + ${project.name} + ${project.version} + ${project.organization.name} + org.apache + ${project.build.source} + ${project.build.target} + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8 + + + org.apache.maven.plugins + maven-gpg-plugin + 1.4 + + + org.codehaus.mojo + rmic-maven-plugin + 1.1 + + + + + org.codehaus.mojo rmic-maven-plugin - 1.1 - - rmic-process-classes - - rmic - - - ${project.build.outputDirectory} - - org.apache.jcs.auxiliary.remote.RemoteCacheListener - org.apache.jcs.auxiliary.remote.server.RemoteCacheServer - - - + + rmic + + rmic + + + + **/RemoteCacheListener.class + **/RemoteCacheServer.class + + ${project.build.outputDirectory} + + - - maven-assembly-plugin - - - src/assembly/bin.xml - src/assembly/src.xml - - gnu - - @@ -427,16 +454,52 @@ org.apache.maven.plugins + maven-javadoc-plugin + 2.8 + + true + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + true + + + + org.apache.maven.plugins + maven-site-plugin + 3.0 + + + org.apache.maven.plugins maven-surefire-report-plugin + 2.11 org.codehaus.mojo jdepend-maven-plugin - 2.0-beta-1 + 2.0-beta-2 org.codehaus.mojo rat-maven-plugin + 1.0-alpha-3 + + + org.apache.maven.plugins + maven-pmd-plugin + 2.5 + + 1.5 + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.3.2 org.apache.maven.plugins @@ -456,19 +519,6 @@ - - org.apache.maven.plugins - maven-pmd-plugin - 2.5 - - 1.5 - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.2 - @@ -484,6 +534,33 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + pertest + -Djava.security.manager -Djava.security.policy=${basedir}/src/conf/cache.policy -Xms256m -Xmx256m + + **/*${test.type}Test.java + + + + + + + **/BlockDiskElementDescriptorUnitTest.java + **/HSQLDiskCacheConcurrentUnitTest.java + **/HSQLDiskCacheUnitTest.java + **/IndexedDiskCacheOptimizationUnitTest.java + **/TestTCPLateralUnitTest.java + **/UDPDiscoveryUnitTest.java + + + + org.apache.maven.plugins @@ -522,12 +599,19 @@ jar - - ${maven.compile.source} - + + maven-assembly-plugin + + + src/assembly/bin.xml + src/assembly/src.xml + + gnu + + @@ -547,8 +631,36 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + pertest + -Djava.security.manager -Djava.security.policy=${basedir}/src/conf/cache.policy -Xms256m -Xmx256m + + **/*${test.type}Test.java + + + + + + + **/BlockDiskElementDescriptorUnitTest.java + **/HSQLDiskCacheConcurrentUnitTest.java + **/HSQLDiskCacheUnitTest.java + **/IndexedDiskCacheOptimizationUnitTest.java + **/TestTCPLateralUnitTest.java + **/UDPDiscoveryUnitTest.java + + + + + org.apache.maven.plugins maven-gpg-plugin ${gpg.passphrase} @@ -564,6 +676,7 @@ + org.apache.maven.plugins maven-source-plugin @@ -575,6 +688,7 @@ + org.apache.maven.plugins maven-javadoc-plugin @@ -582,9 +696,6 @@ jar - - ${maven.compile.source} - @@ -596,6 +707,7 @@ + UTF-8 1.5 1.5 @@ -616,6 +728,7 @@ UTF-8 http://download.oracle.com/javase/1.5.0/docs/api/ + Unit Modified: commons/proper/jcs/trunk/project-b4.xml URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/project-b4.xml?rev=1344374&r1=1344373&r2=1344374&view=diff ============================================================================== --- commons/proper/jcs/trunk/project-b4.xml (original) +++ commons/proper/jcs/trunk/project-b4.xml Wed May 30 18:14:43 2012 @@ -1,155 +0,0 @@ - - - - - - - 3 - jakarta-turbine-jcs - jcs - 1.1.3-dev - - Apache Software Foundation - http://jakarta.apache.org/ - - 2002 - org.apache.jcs - - jakarta - - Cache - Comprehensive Caching System - http://jakarta.apache.org/turbine/jcs/ - http://issues.apache.org/scarab/servlet/scarab/ - jakarta.apache.org - /www/jakarta.apache.org/turbine/jcs/ - /www/jakarta.apache.org/builds/jakarta-turbine-jcs/ - - - scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-jcs - http://cvs.apache.org/viewcvs/jakarta-turbine-jcs/ - - - - - JCS User List - turbine-jcs-user-subscribe@jakarta.apache.org - turbine-jcs-user-unsubscribe@jakarta.apache.org - http://www.mail-archive.com/turbine-jcs-user@jakarta.apache.org/ - - - JCS Developer List - mailto:turbine-jcs-dev-subscribe@jakarta.apache.org - mailto:turbine-jcs-dev-unsubscribe@jakarta.apache.org - http://www.mail-archive.com/turbine-jcs-dev@jakarta.apache.org/ - - - - - Aaron Smuts - asmuts - asmuts@apache.org - - - - Jason van Zyl - jvanzyl - jason@zenplex.com - Zenplex - - - James Taylor - jtaylor - james@jamestaylor.org - - - - - - - commons-configuration - 1.0-dev - - - commons-logging - 1.0.3 - - - commons-lang - 1.0-dev-20020716 - - - concurrent - 1.0 - - - hsqldb - 1.7.0 - - - log4j - 1.2.8 - - - servletapi - 2.2 - - - javagroups - 2.0 - - - jisp - 1.0.2 - - - tomcat - 3.2.1 - tomcat-util-3.2.1.jar - - - velocity - 1.3 - - - - - - xmlrpc - 1.1 - - - - - src/java - src/test - - - include = **/TestJCS.java - include = **/TestSimpleLoad.java - include = **/TestDiskCache.java - include = **/TestDiskCacheConcurrent.java - include = **/TestTCPLateralCache.java - include = **/TestLRUMemoryCache.java - - - - -