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 2012/05/30 20:14:51 UTC
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...
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<K, V> 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<K, V> 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<K, V> 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<K, V> ) 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<Serializable> getGroupKeys( String group )
+ public Set<K> 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<K, V> cacheElement;
private int command;
- public Request( ICacheElement cacheElement, int command )
+ public Request( ICacheElement<K, V> cacheElement, int command )
{
this.cacheElement = cacheElement;
this.command = command;
}
- public ICacheElement getCacheElement()
+ public ICacheElement<K, V> 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<K, V> 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<K, V> 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<K, V> 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<Serializable> getGroupKeys( String group )
+ public Set<K> getGroupKeys( String group )
{
return null;
}
@@ -430,17 +430,17 @@ public class JavaGroupsCache
public final static int GET = 5;
- private ICacheElement cacheElement;
+ private ICacheElement<K, V> cacheElement;
private int command;
- public Request( ICacheElement cacheElement, int command )
+ public Request( ICacheElement<K, V> cacheElement, int command )
{
this.cacheElement = cacheElement;
this.command = command;
}
- public ICacheElement getCacheElement()
+ public ICacheElement<K, V> 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<K, V> 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<K, V> sendAndReceive( LateralElementDescriptor led )
throws IOException
{
- ICacheElement ice = null;
+ ICacheElement<K, V> 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<K, V> 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<K, V> 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<K, V> 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<K, V> 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<Serializable> getGroupKeys( String cacheName, String group )
+ public Set<K> 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<K, V> 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<K, V> getQuiet(K key) throws IOException
{
- ICacheElement ce = null;
+ ICacheElement<K, V> 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<K, V> if found, else null
*@exception IOException
*/
- public synchronized ICacheElement get(Serializable key) throws IOException
+ public synchronized ICacheElement<K, V> get(K key) throws IOException
{
- ICacheElement ce = null;
+ ICacheElement<K, V> 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<K, V> 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!--
-
- WARNING: This file is generated! Do not edit by hand!
-
--->
-
-<project name="maven" default="jar" basedir=".">
-
- <target
- name="jar">
-
- <property name="build.dir" value="target"/>
- <property name="build.dest" value="${maven.build.dir}/classes"/>
-
- <mkdir dir="${maven.build.dest}"/>
-
- <javac
- destdir="${maven.build.dest}"
- excludes="**/package.html"
- debug="false"
- deprecation="false"
- optimize="false">
- <src>
- <pathelement location="src/java"/>
- </src>
- </javac>
-
- <jar
- jarfile="${maven.build.dir}/${maven.final.name}.jar"
- basedir="${maven.build.dest}"
- excludes="**/package.html"
- />
-
- </target>
-
-</project>
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 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<project name="maven" default="maven:jar" basedir=".">
-
- <!-- Give user a chance to override without editing this file
- (and without typing -D each time they invoke a target) -->
-
- <!-- Allow any user specific values to override the defaults -->
- <property file="${user.home}/build.properties" />
- <!-- Allow user defaults for this project -->
- <property file="build.properties" />
- <!-- Set default values for the build -->
- <property file="project.properties" />
-
- <target
- name="jcs:test-prepare">
-
- <!-- Make directory for log output from tests (distinct from reports) -->
-
- <mkdir dir="target/test-sandbox/logs/jcs"/>
-
- <!-- Copy test config files to the test build dir -->
-
- <copy todir="target/test-classes">
- <fileset dir="src/test-conf"/>
- </copy>
-
- </target>
-
- <target name="jcs:copy-classpath-vm">
- <copy todir="${maven.build.dest}">
- <fileset dir="src/java" includes="**/*.vm"/>
- </copy>
- </target>
-
- <!-- The targets people are used to -->
-
- <target name="clean" depends="maven:compile"/>
- <target name="compile" depends="maven:compile"/>
- <target name="test" depends="maven:test"/>
- <target name="jar" depends="maven:jar"/>
-
-
- <!-- maven:start -->
-
- <!-- ================================================================== -->
- <!-- D E L E G A T O R S -->
- <!-- ================================================================== -->
-
-
- <target name="maven:gump-descriptor">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="gump-descriptor"/>
- </target>
-
-
- <target name="maven:maven-update">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="maven-update"/>
- </target>
-
-
- <target name="maven:update-jars">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="update-jars"/>
- </target>
-
-
- <target name="maven:jar">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="jar"/>
- </target>
-
-
- <target name="maven:docs-quick">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="docs-quick"/>
- </target>
-
-
- <target name="maven:run-singletest">
- <ant antfile="${maven.home}/plugins/test/build.xml" target="run-singletest"/>
- </target>
-
-
- <target name="maven:compile">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="compile"/>
- </target>
-
-
- <target name="maven:fo">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="fo"/>
- </target>
-
-
- <target name="maven:cvs-change-log">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="cvs-change-log"/>
- </target>
-
-
- <target name="maven:war">
- <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="war"/>
- </target>
-
-
- <target name="maven:generate-reactor">
- <ant antfile="${maven.home}/plugins/reactor/build.xml" target="generate-reactor"/>
- </target>
-
-
- <target name="maven:cross-ref">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="cross-ref"/>
- </target>
-
-
- <target name="maven:deploy-site">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="deploy-site"/>
- </target>
-
-
- <target name="maven:ear">
- <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="ear"/>
- </target>
-
-
- <target name="maven:install-jar">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="install-jar"/>
- </target>
-
-
- <target name="maven:task-list">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="task-list"/>
- </target>
-
-
- <target name="maven:docs">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="docs"/>
- </target>
-
-
- <target name="maven:site">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="site"/>
- </target>
-
-
- <target name="maven:deploy-dist">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="deploy-dist"/>
- </target>
-
-
- <target name="maven:javadocs">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="javadocs"/>
- </target>
-
-
- <target name="maven:announce">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="announce"/>
- </target>
-
-
- <target name="maven:check-source">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="check-source"/>
- </target>
-
-
- <target name="maven:dist">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="dist"/>
- </target>
-
-
- <target name="maven:dist-build">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="dist-build"/>
- </target>
-
-
- <target name="maven:metrics">
- <ant antfile="${maven.home}/plugins/metrics/build.xml" target="metrics"/>
- </target>
-
-
- <target name="maven:clean">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="clean"/>
- </target>
-
-
- <target name="maven:env">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="env"/>
- </target>
-
-
- <target name="maven:test">
- <ant antfile="${maven.home}/plugins/test/build.xml" target="test"/>
- </target>
-
-
- <target name="maven:pdf">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="pdf"/>
- </target>
-
-
- <target name="maven:iutest">
- <ant antfile="${maven.home}/plugins/iutest/build.xml" target="iutest"/>
- </target>
-
-
- <target name="maven:activity-log">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="activity-log"/>
- </target>
-
-
- <target name="maven:verify-project">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="verify-project"/>
- </target>
-
-
- <target name="maven:validate-pom">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="validate-pom"/>
- </target>
-
-
- <target name="maven:validate-war">
- <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="validate-war"/>
- </target>
-
-
- <!-- maven:end -->
-
-</project>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<module name="jakarta-jcs">
-
-
- <description>Cache</description>
- <url href="http://jakarta.apache.org/jcs/"/>
-
- <cvs repository="jakarta"/>
-
- <!-- This is really the cvs module. We need to change this but -->
- <!-- I will leave this for now until everything works. -->
-
- <project name="jakarta-jcs">
-
- <!-- Standard Maven target to produce Javadocs, source -->
- <!-- and binary distributions. -->
-
- <ant buildfile="build-gump.xml" target="jar">
- <property name="final.name" value="jcs-@@DATE@@"/>
- </ant>
-
- <!-- All Maven projects need Ant and Xerces to build. -->
- <depend project="jakarta-ant"/>
- <depend project="xml-xerces"/>
-
- <depend project="commons-configuration"/>
- <depend project="commons-logging"/>
- <depend project="commons-lang"/>
- <depend project="concurrent"/>
- <depend project="hsqldb"/>
- <depend project="jakarta-log4j"/>
- <depend project="jakarta-servletapi"/>
- <depend project="javagroups"/>
- <depend project="jisp"/>
- <depend project="jakarta-tomcat-util"/>
- <depend project="jakarta-tomcat"/>
- <depend project="xml-rpc"/>
- <depend project="jakarta-velocity"/>
-
- <work nested="target/classes"/>
- <home nested="target"/>
- <jar name="jcs-@@DATE@@.jar"/>
- <javadoc nested="docs/apidocs"/>
-
- <nag to="turbine-jcs-dev@jakarta.apache.org"
- from="JCS Developers <turbine-jcs-dev@jakarta.apache.org>"/>
-
- </project>
-
-</module>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project default="java:jar" xmlns:j="jelly:core" xmlns:ant="jelly:ant"
- xmlns:deploy="deploy" xmlns:u="jelly:util" xmlns:maven="jelly:maven">
-
- <preGoal name="test:test">
- <!-- Work area for unit tests -->
- <mkdir dir="target/test-sandbox/logs"/>
- <copy todir="target/test-classes">
- <fileset dir="src/test-conf"/>
- </copy>
- </preGoal>
-
- <preGoal name="test:single">
- <!-- Work area for unit tests -->
- <mkdir dir="target/test-sandbox/logs"/>
- <copy todir="target/test-classes">
- <fileset dir="src/test-conf"/>
- </copy>
- </preGoal>
-
- <postGoal name="java:compile" >
- <attainGoal name="rmic"/>
- </postGoal>
-
-
- <goal name="rmic" xmlns:j="jelly:core" xmlns:u="jelly:util">
- <rmic base="${maven.build.dest}" classname="org.apache.jcs.auxiliary.remote.RemoteCacheListener">
- <classpath>
- <path refid="maven.dependency.classpath"/>
- </classpath>
- </rmic>
-
- <rmic base="${maven.build.dest}" classname="org.apache.jcs.auxiliary.remote.server.RemoteCacheServer">
- <classpath>
- <path refid="maven.dependency.classpath"/>
- </classpath>
- </rmic>
- </goal>
-
- <goal name="copyjars">
- <j:forEach var="lib" items="${pom.artifacts}">
- <ant:copy todir="${basedir}/jars" file="${lib.path}"/>
- </j:forEach>
- </goal>
-
- <postGoal name="site">
- <attainGoal name="pdf"/>
- </postGoal>
-
- <!-- The eclipse goal runs .project and .classpath generation -->
- <!-- I want to prevent the .project file genreation, so -->
- <!-- the ant external tool builder will not get wiped out. -->
- <goal name="SKIPeclipse:generate-project">
- <!-- do nothing -->
- <ant:echo>Not generating the .project file.</ant:echo>
- </goal>
-
- <!-- ================================================================== -->
- <!-- D I S T : B U I L D _ B I N P R E G O A L -->
- <!-- ================================================================== -->
- <!-- copies NOTICE, LICENSE.txt -->
- <!-- ${maven.dist.bin.assembly.dir} to include them in the binary dists -->
- <!-- ================================================================== -->
- <preGoal name="dist:build-bin">
- <!-- include listed dependencies -->
- <!-- j:forEach var="dep" items="${pom.dependencies}">
- <j:if test="${dep.getProperty('dist.bundle') != null && dep.getProperty('dist.bundle').equalsIgnoreCase('true')}">
- <copy todir="${maven.dist.bin.assembly.dir}/lib"
- file="${maven.repo.local}/${dep.getArtifactDirectory()}/jars/${dep.getArtifact()}"/>
- </j:if>
- </j:forEach -->
-
- <copy todir="${maven.dist.bin.assembly.dir}" failonerror="false">
- <fileset dir="${basedir}">
- <include name="pom.xml"/>
- <include name="project.xml"/>
- <include name="project.properties"/>
- <include name="NOTICE"/>
- <include name="LICENSE.txt"/>
- <include name="LICENSE.xerox"/>
- </fileset>
- </copy>
- </preGoal>
-
- <!-- ================================================================== -->
- <!-- D I S T : B U I L D _ S R C P R E G O A L -->
- <!-- ================================================================== -->
- <preGoal name="dist:build-src">
- <copy todir="${maven.dist.src.assembly.dir}">
- <fileset dir="${basedir}">
- <include name="pom.xml"/>
- <include name="project.xml"/>
- <include name="project.properties"/>
- <include name="NOTICE"/>
- <include name="LICENSE.txt"/>
- <include name="LICENSE.xerox"/>
- </fileset>
- </copy>
- </preGoal>
-
-</project>
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 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-parent</artifactId>
- <version>21</version>
+ <artifactId>commons-parent</artifactId>
+ <version>21</version>
</parent>
<groupId>org.apache.jcs</groupId>
<artifactId>jcs</artifactId>
@@ -121,7 +121,6 @@
<optional>true</optional>
</dependency>
-
<!-- LGPL! -->
<!--
<dependency>
@@ -197,22 +196,23 @@
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
- <type>jar</type>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <type>jar</type>
- <scope>compile</scope>
- <optional>true</optional>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ <optional>true</optional>
</dependency>
+
</dependencies>
<!-- We don't use Continuum yet -->
@@ -232,7 +232,7 @@
<distributionManagement>
<!--
- This POM's parent POM (the Apache Commons POM) provides repositories. Unfortunately,
+ This POM's parent POM (the Apache root POM) provides repositories. Unfortunately,
this allows for accidental deployments. So we disable them here by providing
a dummy repository. Use "mvn -Prc deploy" (Apache snapshot repository) or
"mvn -Prelease deploy" (Apache release repository), if you really want to deploy.
@@ -274,13 +274,13 @@
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-jcs-dev/</archive>
</mailingList>
<mailingList>
- <name>Old User List Archive</name>
+ <name>OLD User List Archive</name>
<subscribe></subscribe>
<unsubscribe></unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-turbine-jcs-user/</archive>
</mailingList>
<mailingList>
- <name>Old Developer List Archive</name>
+ <name>OLD Developer List Archive</name>
<subscribe></subscribe>
<unsubscribe></unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-turbine-jcs-dev/</archive>
@@ -343,10 +343,22 @@
</includes>
</testResource>
</testResources>
- <plugins>
- <plugin>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <encoding>${maven.compile.sourceEncoding}</encoding>
+ <source>${maven.compile.source}</source>
+ <target>${maven.compile.target}</target>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.11</version>
<configuration>
<argLine>-Xmx256m -Djava.security.manager -Djava.security.policy=${basedir}/src/conf/cache.policy</argLine>
<forkMode>pertest</forkMode>
@@ -369,57 +381,72 @@
<!-- <exclude>**/JDBCDiskCacheRemovalUnitTest.java</exclude> -->
<!-- <exclude>**/JDBCDiskCacheUnitTest.java</exclude> -->
</excludes>
+ <source>${maven.compile.source}</source>
</configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${maven.compile.source}</X-Compile-Target-JDK>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Specification-Title>${project.name}</Specification-Title>
+ <Specification-Version>${project.version}</Specification-Version>
+ <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <X-Compile-Source-JDK>${project.build.source}</X-Compile-Source-JDK>
+ <X-Compile-Target-JDK>${project.build.target}</X-Compile-Target-JDK>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rmic-maven-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <!-- We need to generate some stub/skel classes with RMIC -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rmic-maven-plugin</artifactId>
- <version>1.1</version>
<executions>
- <execution>
- <id>rmic-process-classes</id>
- <goals>
- <goal>rmic</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.outputDirectory}</outputDirectory>
- <includes>
- <include>org.apache.jcs.auxiliary.remote.RemoteCacheListener</include>
- <include>org.apache.jcs.auxiliary.remote.server.RemoteCacheServer</include>
- </includes>
- </configuration>
- </execution>
+ <execution>
+ <id>rmic</id>
+ <goals>
+ <goal>rmic</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>**/RemoteCacheListener.class</include>
+ <include>**/RemoteCacheServer.class</include>
+ </includes>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/bin.xml</descriptor>
- <descriptor>src/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -427,16 +454,52 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.11</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
+ <version>2.0-beta-2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -456,19 +519,6 @@
</reportSet>
</reportSets>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
</plugins>
</reporting>
@@ -484,6 +534,33 @@
</distributionManagement>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <argLine>-Djava.security.manager -Djava.security.policy=${basedir}/src/conf/cache.policy -Xms256m -Xmx256m</argLine>
+ <includes>
+ <include>**/*${test.type}Test.java</include>
+ </includes>
+ <excludes>
+ <!-- Several of the test cases rely on background -->
+ <!-- tasks that are timing sensitive. -->
+ <!-- You need to manually run these test cases. -->
+ <!-- The ones that fail may be different for you. -->
+ <exclude>**/BlockDiskElementDescriptorUnitTest.java</exclude>
+ <exclude>**/HSQLDiskCacheConcurrentUnitTest.java</exclude>
+ <exclude>**/HSQLDiskCacheUnitTest.java</exclude>
+ <exclude>**/IndexedDiskCacheOptimizationUnitTest.java</exclude>
+ <exclude>**/TestTCPLateralUnitTest.java</exclude>
+ <exclude>**/UDPDiscoveryUnitTest.java</exclude>
+ <!--
+ <exclude>**/JDBCDiskCacheRemovalUnitTest.java</exclude>
+ <exclude>**/JDBCDiskCacheUnitTest.java</exclude>
+ -->
+ </excludes>
+ </configuration>
+ </plugin>
<!-- We want to sign the artifact, the POM, and all attached artifacts -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -522,12 +599,19 @@
<goals>
<goal>jar</goal>
</goals>
- <configuration>
- <source>${maven.compile.source}</source>
- </configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
@@ -547,8 +631,36 @@
</distributionManagement>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <argLine>-Djava.security.manager -Djava.security.policy=${basedir}/src/conf/cache.policy -Xms256m -Xmx256m</argLine>
+ <includes>
+ <include>**/*${test.type}Test.java</include>
+ </includes>
+ <excludes>
+ <!-- Several of the test cases rely on background -->
+ <!-- tasks that are timing sensitive. -->
+ <!-- You need to manually run these test cases. -->
+ <!-- The ones that fail may be different for you. -->
+ <exclude>**/BlockDiskElementDescriptorUnitTest.java</exclude>
+ <exclude>**/HSQLDiskCacheConcurrentUnitTest.java</exclude>
+ <exclude>**/HSQLDiskCacheUnitTest.java</exclude>
+ <exclude>**/IndexedDiskCacheOptimizationUnitTest.java</exclude>
+ <exclude>**/TestTCPLateralUnitTest.java</exclude>
+ <exclude>**/UDPDiscoveryUnitTest.java</exclude>
+ <!--
+ <exclude>**/JDBCDiskCacheRemovalUnitTest.java</exclude>
+ <exclude>**/JDBCDiskCacheUnitTest.java</exclude>
+ -->
+ </excludes>
+ </configuration>
+ </plugin>
<!-- We want to sign the artifact, the POM, and all attached artifacts -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<passphrase>${gpg.passphrase}</passphrase>
@@ -564,6 +676,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
@@ -575,6 +688,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
@@ -582,9 +696,6 @@
<goals>
<goal>jar</goal>
</goals>
- <configuration>
- <source>${maven.compile.source}</source>
- </configuration>
</execution>
</executions>
</plugin>
@@ -596,6 +707,7 @@
<properties>
<!-- Default configuration for compiler source and target JVM -->
+ <maven.compile.sourceEncoding>UTF-8</maven.compile.sourceEncoding>
<maven.compile.source>1.5</maven.compile.source>
<maven.compile.target>1.5</maven.compile.target>
@@ -616,6 +728,7 @@
<commons.encoding>UTF-8</commons.encoding>
<commons.javadoc.java.link>http://download.oracle.com/javase/1.5.0/docs/api/</commons.javadoc.java.link>
+ <test.type>Unit</test.type>
</properties>
</project>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- For use with maven b4 -->
-
-<project>
- <pomVersion>3</pomVersion>
- <name>jakarta-turbine-jcs</name>
- <id>jcs</id>
- <currentVersion>1.1.3-dev</currentVersion>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://jakarta.apache.org/</url>
- </organization>
- <inceptionYear>2002</inceptionYear>
- <package>org.apache.jcs</package>
-
- <gumpRepositoryId>jakarta</gumpRepositoryId>
-
- <shortDescription>Cache</shortDescription>
- <description>Comprehensive Caching System</description>
- <url>http://jakarta.apache.org/turbine/jcs/</url>
- <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
- <siteAddress>jakarta.apache.org</siteAddress>
- <siteDirectory>/www/jakarta.apache.org/turbine/jcs/</siteDirectory>
- <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-jcs/</distributionDirectory>
-
- <repository>
- <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-jcs</connection>
- <url>http://cvs.apache.org/viewcvs/jakarta-turbine-jcs/</url>
- </repository>
-
- <mailingLists>
- <mailingList>
- <name>JCS User List</name>
- <subscribe>turbine-jcs-user-subscribe@jakarta.apache.org</subscribe>
- <unsubscribe>turbine-jcs-user-unsubscribe@jakarta.apache.org</unsubscribe>
- <archive>http://www.mail-archive.com/turbine-jcs-user@jakarta.apache.org/</archive>
- </mailingList>
- <mailingList>
- <name>JCS Developer List</name>
- <subscribe>mailto:turbine-jcs-dev-subscribe@jakarta.apache.org</subscribe>
- <unsubscribe>mailto:turbine-jcs-dev-unsubscribe@jakarta.apache.org</unsubscribe>
- <archive>http://www.mail-archive.com/turbine-jcs-dev@jakarta.apache.org/</archive>
- </mailingList>
- </mailingLists>
- <developers>
- <developer>
- <name>Aaron Smuts</name>
- <id>asmuts</id>
- <email>asmuts@apache.org</email>
- <organization/>
- </developer>
- <developer>
- <name>Jason van Zyl</name>
- <id>jvanzyl</id>
- <email>jason@zenplex.com</email>
- <organization>Zenplex</organization>
- </developer>
- <developer>
- <name>James Taylor</name>
- <id>jtaylor</id>
- <email>james@jamestaylor.org</email>
- <organization/>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <id>commons-configuration</id>
- <version>1.0-dev</version>
- </dependency>
- <dependency>
- <id>commons-logging</id>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <id>commons-lang</id>
- <version>1.0-dev-20020716</version>
- </dependency>
- <dependency>
- <id>concurrent</id>
- <version>1.0</version>
- </dependency>
- <dependency>
- <id>hsqldb</id>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <id>log4j</id>
- <version>1.2.8</version>
- </dependency>
- <dependency>
- <id>servletapi</id>
- <version>2.2</version>
- </dependency>
- <dependency>
- <id>javagroups</id>
- <version>2.0</version>
- </dependency>
- <dependency>
- <id>jisp</id>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <id>tomcat</id>
- <version>3.2.1</version>
- <jar>tomcat-util-3.2.1.jar</jar>
- </dependency>
- <dependency>
- <id>velocity</id>
- <version>1.3</version>
- </dependency>
-
- <!-- Required for the server in JCS -->
-
- <dependency>
- <id>xmlrpc</id>
- <version>1.1</version>
- </dependency>
-
- </dependencies>
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <aspectSourceDirectories></aspectSourceDirectories>
- <unitTestPatterns>
- <unitTestPattern>include = **/TestJCS.java</unitTestPattern>
- <unitTestPattern>include = **/TestSimpleLoad.java</unitTestPattern>
- <unitTestPattern>include = **/TestDiskCache.java</unitTestPattern>
- <unitTestPattern>include = **/TestDiskCacheConcurrent.java</unitTestPattern>
- <unitTestPattern>include = **/TestTCPLateralCache.java</unitTestPattern>
- <unitTestPattern>include = **/TestLRUMemoryCache.java</unitTestPattern>
- </unitTestPatterns>
- <jarResources></jarResources>
- <jars></jars>
- </build>
-</project>