[exo-jcr-commits] exo-jcr SVN: r5435 - in kernel/trunk: exo.kernel.component.ext.cache.impl.infinispan.v5 and 5 other directories.

Author: nfilotto Date: 2012-01-10 12:39:28 -0500 (Tue, 10 Jan 2012) New Revision: 5435 Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/AbstractExoCache.java kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/ExoCacheFactoryImpl.java kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/distributed/DistributedExoCache.java kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/test/java/org/exoplatform/services/cache/impl/infinispan/TestAbstractExoCache.java kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/test/resources/conf/portal/test-configuration.xml kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml kernel/trunk/pom.xml Log: EXOJCR-1682: Kernel part has been upgraded to ISPN 5.1.0.CR3 and JGroups 3.0.2.Final Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2012-01-10 14:36:40 UTC (rev 5434) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2012-01-10 17:39:28 UTC (rev 5435) @@ -34,7 +34,7 @@ <dependency> <groupId>org.jgroups</groupId> <artifactId>jgroups</artifactId> - <version>3.0.0.Final</version> + <version>3.0.2.Final</version> </dependency> <dependency> <groupId>org.slf4j</groupId> Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/AbstractExoCache.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/AbstractExoCache.java 2012-01-10 14:36:40 UTC (rev 5434) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/AbstractExoCache.java 2012-01-10 17:39:28 UTC (rev 5435) @@ -227,6 +227,11 @@ { throw new NullPointerException("No null cache key accepted"); } + else if (value == null) + { + // ignore null values + return; + } SecurityHelper.doPrivilegedAction(new PrivilegedAction<Void>() { Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/ExoCacheFactoryImpl.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/ExoCacheFactoryImpl.java 2012-01-10 14:36:40 UTC (rev 5434) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/ExoCacheFactoryImpl.java 2012-01-10 17:39:28 UTC (rev 5435) @@ -372,7 +372,6 @@ confBuilder.read(cacheManager.getDefaultCacheConfiguration()); //TODO remove it once ISPN-1687 will be fixed confBuilder.storeAsBinary().enabled(false); - confBuilder.jmxStatistics().enable(); //TODO remove it once ISPN-1689 will be fixed confBuilder .clustering() @@ -401,7 +400,6 @@ confBuilder.read(cacheManager.getDefaultCacheConfiguration()); //TODO remove it once ISPN-1687 will be fixed confBuilder.storeAsBinary().enabled(false); - confBuilder.jmxStatistics().enable(); //TODO remove it once ISPN-1689 will be fixed confBuilder .clustering() Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/distributed/DistributedExoCache.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/distributed/DistributedExoCache.java 2012-01-10 14:36:40 UTC (rev 5434) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/distributed/DistributedExoCache.java 2012-01-10 17:39:28 UTC (rev 5435) @@ -366,6 +366,11 @@ { throw new NullPointerException("No null cache key accepted"); } + else if (value == null) + { + // ignore null values + return; + } SecurityHelper.doPrivilegedAction(new PrivilegedAction<Void>() { Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/test/java/org/exoplatform/services/cache/impl/infinispan/TestAbstractExoCache.java =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/test/java/org/exoplatform/services/cache/impl/infinispan/TestAbstractExoCache.java 2012-01-10 14:36:40 UTC (rev 5434) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/test/java/org/exoplatform/services/cache/impl/infinispan/TestAbstractExoCache.java 2012-01-10 17:39:28 UTC (rev 5435) @@ -519,7 +519,7 @@ @Override public boolean equals(Object paramObject) { - return paramObject instanceof MyKey && ((MyKey)paramObject).value.endsWith(value); + return paramObject instanceof MyKey && ((MyKey)paramObject).value.equals(value); } @Override @@ -546,13 +546,13 @@ + System.getProperty("java.net.preferIPv4Stack")); ExoCacheConfig config = new ExoCacheConfig(); config.setName("MyCacheDistributed"); - config.setMaxSize(5); + config.setMaxSize(8); config.setLiveTime(1); config.setImplementation("LRU"); config.setReplicated(true); ExoCacheConfig config2 = new ExoCacheConfig(); config2.setName("MyCacheDistributed2"); - config2.setMaxSize(5); + config2.setMaxSize(8); config2.setLiveTime(1); config2.setImplementation("LRU"); config2.setReplicated(true); Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/test/resources/conf/portal/test-configuration.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/test/resources/conf/portal/test-configuration.xml 2012-01-10 14:36:40 UTC (rev 5434) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/test/resources/conf/portal/test-configuration.xml 2012-01-10 17:39:28 UTC (rev 5435) @@ -32,7 +32,7 @@ <description>The default cache configuration</description> <object type="org.exoplatform.services.cache.ExoCacheConfig"> <field name="name"><string>default</string></field> - <field name="maxSize"><int>5</int></field> + <field name="maxSize"><int>10</int></field> <field name="liveTime"><long>2</long></field> </object> </object-param> @@ -223,9 +223,6 @@ <string>LRU</string> </value> <value> - <string>LRU_OLD</string> - </value> - <value> <string>UNORDERED</string> </value> <value> Modified: kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2012-01-10 14:36:40 UTC (rev 5434) +++ kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2012-01-10 17:39:28 UTC (rev 5435) @@ -40,7 +40,7 @@ <dependency> <groupId>org.jgroups</groupId> <artifactId>jgroups</artifactId> - <version>3.0.0.Final</version> + <version>3.0.2.Final</version> </dependency> <dependency> <groupId>org.slf4j</groupId> Modified: kernel/trunk/pom.xml =================================================================== --- kernel/trunk/pom.xml 2012-01-10 14:36:40 UTC (rev 5434) +++ kernel/trunk/pom.xml 2012-01-10 17:39:28 UTC (rev 5435) @@ -213,7 +213,7 @@ <dependency> <groupId>org.infinispan</groupId> <artifactId>infinispan-core</artifactId> - <version>5.1.0.CR2</version> + <version>5.1.0.CR3</version> </dependency> <dependency> <groupId>org.jibx</groupId>