+
+This package contains decorators that are concerned with classloaders
+
+
+
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/resources/ehcache-disk.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/resources/ehcache-disk.xml (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/resources/ehcache-disk.xml (revision 11330)
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/statistics/extended/ExtendedStatistics.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/statistics/extended/ExtendedStatistics.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/statistics/extended/ExtendedStatistics.java (revision 11330)
@@ -0,0 +1,552 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+
+package net.sf.ehcache.statistics.extended;
+
+import net.sf.ehcache.CacheOperationOutcomes;
+import net.sf.ehcache.store.StoreOperationOutcomes;
+import net.sf.ehcache.transaction.xa.XaCommitOutcome;
+import net.sf.ehcache.transaction.xa.XaRecoveryOutcome;
+import net.sf.ehcache.transaction.xa.XaRollbackOutcome;
+import org.terracotta.statistics.archive.Timestamped;
+
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * The ExtendedStatistics interface.
+ *
+ * @author cschanck
+ */
+public interface ExtendedStatistics {
+
+ /** The Constant ALL_CACHE_PUT_OUTCOMES. */
+ static final Set ALL_CACHE_PUT_OUTCOMES = EnumSet.allOf(CacheOperationOutcomes.PutOutcome.class);
+
+ /** The Constant ALL_CACHE_GET_OUTCOMES. */
+ static final Set ALL_CACHE_GET_OUTCOMES = EnumSet.allOf(CacheOperationOutcomes.GetOutcome.class);
+
+ /** The Constant ALL_CACHE_MISS_OUTCOMES. */
+ static final Set ALL_CACHE_MISS_OUTCOMES = EnumSet.of(
+ CacheOperationOutcomes.GetOutcome.MISS_EXPIRED, CacheOperationOutcomes.GetOutcome.MISS_NOT_FOUND);
+
+ /** The Constant ALL_STORE_PUT_OUTCOMES. */
+ static final Set ALL_STORE_PUT_OUTCOMES = EnumSet.allOf(StoreOperationOutcomes.PutOutcome.class);
+
+ /**
+ * Sets the time to disable.
+ *
+ * @param time the time
+ * @param unit the unit
+ */
+ void setTimeToDisable(long time, TimeUnit unit);
+
+ /**
+ * Sets the always on.
+ *
+ * @param alwaysOn the new always on
+ */
+ void setAlwaysOn(boolean alwaysOn);
+
+ /**
+ * Gets the.
+ *
+ * @return the operation
+ */
+ Operation get();
+
+ /**
+ * Put.
+ *
+ * @return the operation
+ */
+ Operation put();
+
+ /**
+ * Removes the.
+ *
+ * @return the operation
+ */
+ Operation remove();
+
+ /**
+ * single arg replace operation
+ * @return
+ */
+ Operation replaceOneArg();
+
+ /**
+ * two arg replace operation
+ * @return
+ */
+ Operation replaceTwoArg();
+
+ /**
+ * put if absent operation
+ * @return
+ */
+ Operation putIfAbsent();
+
+ /**
+ * remove element operation
+ * @return
+ */
+ Operation removeElement();
+
+ /**
+ * Heap get.
+ *
+ * @return the operation
+ */
+ Operation heapGet();
+
+ /**
+ * Offheap get.
+ *
+ * @return the operation
+ */
+ Operation offheapGet();
+
+ /**
+ * Disk get.
+ *
+ * @return the operation
+ */
+ Operation diskGet();
+
+ /**
+ * Heap put.
+ *
+ * @return the operation
+ */
+ Operation heapPut();
+
+ /**
+ * Offheap put.
+ *
+ * @return the operation
+ */
+ Operation offheapPut();
+
+ /**
+ * Disk put.
+ *
+ * @return the operation
+ */
+ Operation diskPut();
+
+ /**
+ * Heap remove.
+ *
+ * @return the operation
+ */
+ Operation heapRemove();
+
+ /**
+ * Offheap remove.
+ *
+ * @return the operation
+ */
+ Operation offheapRemove();
+
+ /**
+ * Disk remove.
+ *
+ * @return the operation
+ */
+ Operation diskRemove();
+
+ /**
+ * Search.
+ *
+ * @return the operation
+ */
+ Operation search();
+
+ /**
+ * Xa commit.
+ *
+ * @return the operation
+ */
+ Operation xaCommit();
+
+ /**
+ * Xa rollback.
+ *
+ * @return the operation
+ */
+ Operation xaRollback();
+
+ /**
+ * Xa recovery.
+ *
+ * @return the operation
+ */
+ Operation xaRecovery();
+
+ /**
+ * Eviction.
+ *
+ * @return the operation
+ */
+ Operation eviction();
+
+ /**
+ * Expiry.
+ *
+ * @return the operation
+ */
+ Operation expiry();
+
+ /**
+ * Cluster events
+ *
+ * @return the operation
+ */
+ Operation clusterEvent();
+
+ /**
+ * Nonstop events
+ *
+ * @return the operation
+ */
+ Operation nonstop();
+
+ /**
+ * All get.
+ *
+ * @return the result
+ */
+ Result allGet();
+
+ /**
+ * All miss.
+ *
+ * @return the result
+ */
+ Result allMiss();
+
+ /**
+ * All put.
+ *
+ * @return the result
+ */
+ Result allPut();
+
+ /**
+ * Heap all put.
+ *
+ * @return the result
+ */
+ Result heapAllPut();
+
+ /**
+ * Off heap all put.
+ *
+ * @return the result
+ */
+ Result offHeapAllPut();
+
+ /**
+ * Disk all put.
+ *
+ * @return the result
+ */
+ Result diskAllPut();
+
+ /**
+ * Cache hit ratio.
+ * @return
+ */
+ Statistic cacheHitRatio();
+
+ /**
+ * Nonstop timeout ratio
+ * @return
+ */
+ Statistic nonstopTimeoutRatio();
+
+ /**
+ * Operations.
+ *
+ * @param the generic type
+ * @param outcome the outcome
+ * @param name the name
+ * @param tags the tags
+ * @return the sets the
+ */
+ > Set> operations(Class outcome, String name, String... tags);
+
+ /**
+ * Get the set of cache specific pass thru statistics for a nam/tags pair. Used for
+ * custom pass thru statistics, as opposed to well known standard ones.
+ * @param name name
+ * @param tags set of tags
+ * @return
+ */
+ Set> passthru(String name, Set tags);
+
+ /**
+ * The Interface Operation.
+ *
+ * @param the generic type
+ */
+ public interface Operation> {
+
+ /**
+ * Type.
+ *
+ * @return the class
+ */
+ Class type();
+
+ /**
+ * Component.
+ *
+ * @param result the result
+ * @return the result
+ */
+ Result component(T result);
+
+ /**
+ * Compound.
+ *
+ * @param results the results
+ * @return the result
+ */
+ Result compound(Set results);
+
+ /**
+ * Ratio of.
+ *
+ * @param numerator the numerator
+ * @param denomiator the denomiator
+ * @return the statistic
+ */
+ Statistic ratioOf(Set numerator, Set denomiator);
+
+ /**
+ * Sets the always on.
+ *
+ * @param enable the new always on
+ */
+ void setAlwaysOn(boolean enable);
+
+ /**
+ * Checks if is always on.
+ *
+ * @return true, if is always on
+ */
+ boolean isAlwaysOn();
+
+ /**
+ * Sets the window.
+ *
+ * @param time the time
+ * @param unit the unit
+ */
+ void setWindow(long time, TimeUnit unit);
+
+ /**
+ * Sets the history.
+ *
+ * @param samples the samples
+ * @param time the time
+ * @param unit the unit
+ */
+ void setHistory(int samples, long time, TimeUnit unit);
+
+ /**
+ * Gets the window size.
+ *
+ * @param unit the unit
+ * @return the window size
+ */
+ long getWindowSize(TimeUnit unit);
+
+ /**
+ * Gets the history sample size.
+ *
+ * @return the history sample size
+ */
+ int getHistorySampleSize();
+
+ /**
+ * Gets the history sample time.
+ *
+ * @param unit the unit
+ * @return the history sample time
+ */
+ long getHistorySampleTime(TimeUnit unit);
+
+ }
+
+ /**
+ * The Interface Result.
+ */
+ public interface Result {
+
+ /**
+ * Count.
+ *
+ * @return the statistic
+ */
+ Statistic count();
+
+ /**
+ * Rate.
+ *
+ * @return the statistic
+ */
+ Statistic rate();
+
+ /**
+ * Latency.
+ *
+ * @return the latency
+ */
+ Latency latency();
+ }
+
+ /**
+ * The Latency interface. Provides min/max/average.
+ */
+ public interface Latency {
+
+ /**
+ * Minimum latency observed.
+ *
+ * @return Minimum observed latency. NULL if no operation was observed.
+ */
+ Statistic minimum();
+
+ /**
+ * Maximum latency observed.
+ *
+ * @return Maximum observed latency. NULL if no operation was observed.
+ */
+ Statistic maximum();
+
+ /**
+ * Average observed latency.
+ *
+ * @return Average observed latency. NULL if no operation was observed.
+ */
+ Statistic average();
+ }
+
+ /**
+ * The Interface Statistic.
+ *
+ * @param the generic type
+ */
+ public interface Statistic {
+
+ /**
+ * Active.
+ *
+ * @return true, if successful
+ */
+ boolean active();
+
+ /**
+ * Value.
+ *
+ * @return the t
+ */
+ T value();
+
+ /**
+ * History.
+ *
+ * @return the list
+ */
+ List> history();
+ }
+
+ /**
+ * Gets the size.
+ *
+ * @return the size
+ */
+ Statistic size();
+
+ /**
+ * Gets the local heap size.
+ *
+ * @return the local heap size
+ */
+ Statistic localHeapSize();
+
+ /**
+ * Gets the local heap size in bytes.
+ *
+ * @return the local heap size in bytes
+ */
+ Statistic localHeapSizeInBytes();
+
+ /**
+ * Gets the local off heap size.
+ *
+ * @return the local off heap size
+ */
+ Statistic localOffHeapSize();
+
+ /**
+ * Gets the local off heap size in bytes.
+ *
+ * @return the local off heap size in bytes
+ */
+ Statistic localOffHeapSizeInBytes();
+
+ /**
+ * Gets the local disk size.
+ *
+ * @return the local disk size
+ */
+ Statistic localDiskSize();
+
+ /**
+ * Gets the local disk size in bytes.
+ *
+ * @return the local disk size in bytes
+ */
+ Statistic localDiskSizeInBytes();
+
+ /**
+ * Gets the remote size.
+ *
+ * @return the remote size
+ */
+ Statistic remoteSize();
+
+ /**
+ * Gets the writer queue length.
+ *
+ * @return the writer queue length
+ */
+ Statistic writerQueueLength();
+
+ /**
+ * Get the timestamp (millis) of the last cluster rejoin event
+ *
+ * @return statistic for cluster rejoin timestamp
+ */
+ Statistic mostRecentRejoinTimeStampMillis();
+
+}
\ No newline at end of file
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/hibernate/management/impl/CacheRegionUtils.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/hibernate/management/impl/CacheRegionUtils.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/hibernate/management/impl/CacheRegionUtils.java (revision 11330)
@@ -0,0 +1,117 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+
+package net.sf.ehcache.hibernate.management.impl;
+
+import java.awt.Color;
+
+/**
+ * CacheRegionUtils
+ *
+ * @author gkeim
+ */
+public abstract class CacheRegionUtils {
+ /**
+ * HIT_COLOR
+ */
+ public static final Color HIT_COLOR = Color.green;
+
+ /**
+ * MISS_COLOR
+ */
+ public static final Color MISS_COLOR = Color.red;
+
+ /**
+ * PUT_COLOR
+ */
+ public static final Color PUT_COLOR = Color.blue;
+
+ /**
+ * HIT_FILL_COLOR
+ */
+ public static final Color HIT_FILL_COLOR = CacheRegionUtils.HIT_COLOR.brighter().brighter().brighter();
+
+ /**
+ * MISS_FILL_COLOR
+ */
+ public static final Color MISS_FILL_COLOR = CacheRegionUtils.MISS_COLOR.brighter().brighter().brighter();
+
+ /**
+ * PUT_FILL_COLOR
+ */
+ public static final Color PUT_FILL_COLOR = CacheRegionUtils.PUT_COLOR.brighter().brighter().brighter();
+
+ /**
+ * HIT_DRAW_COLOR
+ */
+ public static final Color HIT_DRAW_COLOR = CacheRegionUtils.HIT_COLOR.darker();
+
+ /**
+ * MISS_DRAW_COLOR
+ */
+ public static final Color MISS_DRAW_COLOR = CacheRegionUtils.MISS_COLOR.darker();
+
+ /**
+ * PUT_DRAW_COLOR
+ */
+ public static final Color PUT_DRAW_COLOR = CacheRegionUtils.PUT_COLOR.darker();
+
+
+ /**
+ * determineShortName
+ *
+ * @param fullName
+ */
+ public static String determineShortName(String fullName) {
+ String result = fullName;
+
+ if (fullName != null) {
+ String[] comps = fullName.split("\\.");
+ if (comps.length == 1) {
+ return fullName;
+ }
+ boolean truncate = true;
+ for (int i = 0; i < comps.length; i++) {
+ String comp = comps[i];
+ char c = comp.charAt(0);
+ if (truncate && Character.isUpperCase(c)) {
+ truncate = false;
+ }
+ if (truncate) {
+ comps[i] = Character.toString(c);
+ }
+ }
+ result = join(comps, '.');
+ }
+
+ return result;
+ }
+
+ /**
+ * join
+ *
+ * @param elements
+ * @param c
+ */
+ private static String join(String[] elements, char c) {
+ if (elements == null) { return null; }
+ StringBuilder sb = new StringBuilder();
+ for (String s : elements) {
+ sb.append(s).append(c);
+ }
+ return sb.length() > 0 ? sb.substring(0, sb.length() - 1) : "";
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/system-tests/src/test/resources/cache-consistency-test.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/system-tests/src/test/resources/cache-consistency-test.xml (revision 0)
+++ rctags/ehcache-2.10.9.0.363/system-tests/src/test/resources/cache-consistency-test.xml (revision 11330)
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: rctags/ehcache-2.10.9.0.363/ehcache-scheduled-refresh/.project
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-scheduled-refresh/.project (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-scheduled-refresh/.project (revision 11330)
@@ -0,0 +1,23 @@
+
+
+ ehcache-scheduled-refresh
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+ org.eclipse.m2e.core.maven2Nature
+
+
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/constructs/CacheDecoratorFactoryTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/constructs/CacheDecoratorFactoryTest.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/constructs/CacheDecoratorFactoryTest.java (revision 11330)
@@ -0,0 +1,99 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+
+package net.sf.ehcache.constructs;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import junit.framework.TestCase;
+import net.sf.ehcache.CacheManager;
+import net.sf.ehcache.constructs.MockDecoratorFactory.MockDecoratorFactoryCache;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.terracotta.test.categories.CheckShorts;
+
+/**
+ * @author Abhishek Sanoujam
+ */
+@Category(CheckShorts.class)
+public class CacheDecoratorFactoryTest extends TestCase {
+
+ private static final Logger LOG = LoggerFactory.getLogger(CacheDecoratorFactoryTest.class);
+
+ @Test
+ public void testCacheDecoratorFactory() {
+ CacheManager cacheManager = new CacheManager(getClass().getResourceAsStream("/ehcache-decorator-test.xml"));
+ List cacheNames = Arrays.asList(cacheManager.getCacheNames());
+ LOG.info("" + cacheNames);
+
+ assertEquals(12, cacheNames.size());
+
+ assertTrue(cacheNames.contains("noDecoratorCache"));
+ assertTrue(cacheNames.contains("oneDecoratorCache"));
+ assertTrue(cacheNames.contains("oneDecoratorFirst"));
+ assertTrue(cacheNames.contains("twoDecoratorCache"));
+ assertTrue(cacheNames.contains("twoDecoratorFirst"));
+ assertTrue(cacheNames.contains("twoDecoratorSecond"));
+ assertTrue(cacheNames.contains("fiveDecoratorCache"));
+ assertTrue(cacheNames.contains("fiveDecoratorFirst"));
+ assertTrue(cacheNames.contains("fiveDecoratorSecond"));
+ assertTrue(cacheNames.contains("fiveDecoratorThird"));
+ assertTrue(cacheNames.contains("fiveDecoratorFourth"));
+ assertTrue(cacheNames.contains("fiveDecoratorFifth"));
+
+ cacheManager.shutdown();
+
+ }
+
+ @Test
+ public void testCacheDecoratorFactoryProperties() {
+ CacheManager cacheManager = new CacheManager(getClass().getResourceAsStream("/ehcache-decorator-test.xml"));
+ List cacheNames = Arrays.asList(cacheManager.getCacheNames());
+ assertEquals(12, cacheNames.size());
+
+ MockDecoratorFactoryCache cache = (MockDecoratorFactoryCache) cacheManager.getEhcache("oneDecoratorFirst");
+ assertEquals("oneFirst", cache.getProperties().getProperty("someKey"));
+
+ cache = (MockDecoratorFactoryCache) cacheManager.getEhcache("twoDecoratorFirst");
+ assertEquals("twoFirst", cache.getProperties().getProperty("someKey"));
+
+ cache = (MockDecoratorFactoryCache) cacheManager.getEhcache("twoDecoratorSecond");
+ assertEquals("twoSecond", cache.getProperties().getProperty("someKey"));
+
+ cache = (MockDecoratorFactoryCache) cacheManager.getEhcache("fiveDecoratorFirst");
+ assertEquals("fiveFirst", cache.getProperties().getProperty("someKey"));
+
+ cache = (MockDecoratorFactoryCache) cacheManager.getEhcache("fiveDecoratorSecond");
+ assertEquals("fiveSecond", cache.getProperties().getProperty("someKey"));
+
+ cache = (MockDecoratorFactoryCache) cacheManager.getEhcache("fiveDecoratorThird");
+ assertEquals("fiveThird", cache.getProperties().getProperty("someKey"));
+
+ cache = (MockDecoratorFactoryCache) cacheManager.getEhcache("fiveDecoratorFourth");
+ assertEquals("fiveFourth", cache.getProperties().getProperty("someKey"));
+
+ cache = (MockDecoratorFactoryCache) cacheManager.getEhcache("fiveDecoratorFifth");
+ assertEquals("fiveFifth", cache.getProperties().getProperty("someKey"));
+
+ cacheManager.shutdown();
+
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/terracotta/bootstrap/src/test/java/org/terracotta/modules/ehcache/store/CacheConfigChangeBridgeTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/terracotta/bootstrap/src/test/java/org/terracotta/modules/ehcache/store/CacheConfigChangeBridgeTest.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/terracotta/bootstrap/src/test/java/org/terracotta/modules/ehcache/store/CacheConfigChangeBridgeTest.java (revision 11330)
@@ -0,0 +1,132 @@
+package org.terracotta.modules.ehcache.store;
+
+import net.sf.ehcache.config.CacheConfiguration;
+import org.junit.Before;
+import org.junit.Test;
+import org.terracotta.toolkit.config.AbstractConfiguration;
+import org.terracotta.toolkit.config.Configuration;
+import org.terracotta.toolkit.events.ToolkitNotifier;
+import org.terracotta.toolkit.internal.cache.ToolkitCacheInternal;
+import org.terracotta.toolkit.store.ToolkitConfigFields;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author tim
+ */
+public class CacheConfigChangeBridgeTest {
+
+ private ToolkitCacheInternal backend;
+ private CacheConfiguration cacheConfiguration;
+ private ToolkitNotifier notifier;
+ private TestConfiguration toolkitCacheConfig;
+
+ @Before
+ public void setUp() throws Exception {
+ toolkitCacheConfig = new TestConfiguration();
+ backend = when(mock(ToolkitCacheInternal.class).getConfiguration())
+ .thenReturn(toolkitCacheConfig).getMock();
+ cacheConfiguration = spy(new CacheConfiguration());
+ notifier = mock(ToolkitNotifier.class);
+ }
+
+ @Test
+ public void testConnectConfigsSetsUpLocalCacheConfiguration() throws Exception {
+ cacheConfiguration.freezeConfiguration();
+
+ CacheConfigChangeBridge bridge = new CacheConfigChangeBridge("foo",
+ backend, notifier, cacheConfiguration);
+
+ toolkitCacheConfig.internalSetConfigMapping(ToolkitConfigFields.MAX_TOTAL_COUNT_FIELD_NAME, 123);
+ toolkitCacheConfig.internalSetConfigMapping(ToolkitConfigFields.MAX_TTI_SECONDS_FIELD_NAME, 321);
+ toolkitCacheConfig.internalSetConfigMapping(ToolkitConfigFields.MAX_TTL_SECONDS_FIELD_NAME, 456);
+ toolkitCacheConfig.internalSetConfigMapping(ToolkitConfigFields.MAX_COUNT_LOCAL_HEAP_FIELD_NAME, 42);
+ toolkitCacheConfig.internalSetConfigMapping(ToolkitConfigFields.MAX_BYTES_LOCAL_HEAP_FIELD_NAME, 1L);
+ toolkitCacheConfig.internalSetConfigMapping(ToolkitConfigFields.MAX_BYTES_LOCAL_OFFHEAP_FIELD_NAME, 2L);
+ toolkitCacheConfig.internalSetConfigMapping(ToolkitConfigFields.OFFHEAP_ENABLED_FIELD_NAME, true);
+
+ bridge.connectConfigs();
+
+ assertThat(cacheConfiguration.getMaxEntriesInCache(), is(123L));
+ assertThat(cacheConfiguration.getTimeToLiveSeconds(), is(456L));
+ assertThat(cacheConfiguration.getTimeToIdleSeconds(), is(321L));
+ assertThat(cacheConfiguration.isEternal(), is(false));
+ assertThat(cacheConfiguration.getMaxEntriesLocalHeap(), is(42L));
+ assertThat(cacheConfiguration.getMaxBytesLocalHeap(), is(1L));
+ assertThat(cacheConfiguration.getMaxBytesLocalOffHeap(), is(2L));
+ assertThat(cacheConfiguration.isOverflowToOffHeap(), is(true));
+ }
+
+ @Test
+ public void testEmptyConfigFromToolkitCache() throws Exception {
+ CacheConfigChangeBridge bridge = new CacheConfigChangeBridge("foo",
+ backend, notifier, cacheConfiguration);
+
+ bridge.connectConfigs();
+
+ // Empty config so only check for registration of the listener and nothing else.
+ verify(cacheConfiguration).addConfigurationListener(bridge);
+ verifyNoMoreInteractions(cacheConfiguration);
+ }
+
+ @Test
+ public void testOverrideLocallyConfiguredExpiry() throws Exception {
+ cacheConfiguration.setEternal(false);
+ cacheConfiguration.setTimeToLiveSeconds(123);
+ cacheConfiguration.setTimeToIdleSeconds(321);
+
+ CacheConfigChangeBridge bridge = new CacheConfigChangeBridge("foo",
+ backend, notifier, cacheConfiguration);
+
+ toolkitCacheConfig.internalSetConfigMapping(ToolkitConfigFields.MAX_TTI_SECONDS_FIELD_NAME, 0);
+ toolkitCacheConfig.internalSetConfigMapping(ToolkitConfigFields.MAX_TTL_SECONDS_FIELD_NAME, 0);
+
+ bridge.connectConfigs();
+
+ assertThat(cacheConfiguration.isEternal(), is(false));
+ assertThat(cacheConfiguration.getTimeToLiveSeconds(), is(0L));
+ assertThat(cacheConfiguration.getTimeToIdleSeconds(), is(0L));
+ }
+
+ @Test
+ public void testSetUnlimitedMaxEntriesInCache() throws Exception {
+ CacheConfigChangeBridge bridge = new CacheConfigChangeBridge("foo",
+ backend, notifier, cacheConfiguration);
+
+ toolkitCacheConfig.internalSetConfigMapping(ToolkitConfigFields.MAX_TOTAL_COUNT_FIELD_NAME, -1);
+
+ bridge.connectConfigs();
+
+ assertThat(cacheConfiguration.getMaxEntriesInCache(), is(0L));
+ }
+
+ private static class TestConfiguration extends AbstractConfiguration {
+ private final Map map = new HashMap();
+
+ @Override
+ protected void internalSetConfigMapping(final String key, final Serializable value) {
+ map.put(key, value);
+ }
+
+ @Override
+ public Set getKeys() {
+ return map.keySet();
+ }
+
+ @Override
+ public Serializable getObjectOrNull(final String name) {
+ return map.get(name);
+ }
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/org/terracotta/ehcache/tests/container/hibernate/domain/Person.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/org/terracotta/ehcache/tests/container/hibernate/domain/Person.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/org/terracotta/ehcache/tests/container/hibernate/domain/Person.java (revision 11330)
@@ -0,0 +1,108 @@
+/*
+ * All content copyright (c) 2003-2008 Terracotta, Inc., except as may otherwise be noted in a separate copyright notice. All rights reserved.
+ */
+
+package org.terracotta.ehcache.tests.container.hibernate.domain;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class Person {
+
+ private Long id;
+ private int age;
+ private String firstname;
+ private String lastname;
+ private List events = new ArrayList(); // list semantics, e.g., indexed
+ private Set emailAddresses = new HashSet();
+ private Set phoneNumbers = new HashSet();
+ private List talismans = new ArrayList(); // a Bag of good-luck charms.
+
+ public Person() {
+ //
+ }
+
+ public List getEvents() {
+ return events;
+ }
+
+ protected void setEvents(List events) {
+ this.events = events;
+ }
+
+ public void addToEvent(Event event) {
+ this.getEvents().add(event);
+ event.getParticipants().add(this);
+ }
+
+ public void removeFromEvent(Event event) {
+ this.getEvents().remove(event);
+ event.getParticipants().remove(this);
+ }
+
+ public int getAge() {
+ return age;
+ }
+
+ public void setAge(int age) {
+ this.age = age;
+ }
+
+ public String getFirstname() {
+ return firstname;
+ }
+
+ public void setFirstname(String firstname) {
+ this.firstname = firstname;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getLastname() {
+ return lastname;
+ }
+
+ public void setLastname(String lastname) {
+ this.lastname = lastname;
+ }
+
+ public Set getEmailAddresses() {
+ return emailAddresses;
+ }
+
+ public void setEmailAddresses(Set emailAddresses) {
+ this.emailAddresses = emailAddresses;
+ }
+
+ public Set getPhoneNumbers() {
+ return phoneNumbers;
+ }
+
+ public void setPhoneNumbers(Set phoneNumbers) {
+ this.phoneNumbers = phoneNumbers;
+ }
+
+ public void addTalisman(String name) {
+ talismans.add(name);
+ }
+
+ public List getTalismans() {
+ return talismans;
+ }
+
+ public void setTalismans(List talismans) {
+ this.talismans = talismans;
+ }
+
+ public String toString() {
+ return getFirstname() + " " + getLastname();
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/loader/CompositeLoaderTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/loader/CompositeLoaderTest.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/loader/CompositeLoaderTest.java (revision 11330)
@@ -0,0 +1,69 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+
+package net.sf.ehcache.loader;
+
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * ComponentA is composed of ComponentB and some other fields. Tests the interactions between two loaders, where the first component's
+ * loader loads component B by using getWithLoader, which in turn invokes component B's loader.
+ *
+ * @author Greg Luck
+ * @version $Id: CompositeLoaderTest.java 5594 2012-05-07 16:04:31Z cdennis $
+ */
+public class CompositeLoaderTest {
+
+ private static final Logger LOG = LoggerFactory.getLogger(CompositeLoaderTest.class.getName());
+
+ /**
+ * Sets up the fixture, for example, open a network connection.
+ * This method is called before a test is executed.
+ */
+ @Before
+ public void setUp() throws Exception {
+ CacheHelper.init();
+ }
+
+ /**
+ * Tears down the fixture, for example, close a network connection.
+ * This method is called after a test is executed.
+ */
+ @After
+ public void tearDown() throws Exception {
+ CacheHelper.shutdown();
+ }
+
+ /**
+ * This test reproduces a deadlock found in 1.4-beta1 around loading interactions and getWithLoader. Now fixed.
+ */
+ @Test
+ public void testCompositeLoad() {
+ LOG.info("Getting from cache");
+ ComponentA compA = (ComponentA) CacheHelper.get("ehcache-loaderinteractions.xml", "ACache", "key1");
+ LOG.info(compA.toString());
+
+ }
+
+}
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/resources/cachemanager-perf.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/resources/cachemanager-perf.xml (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/resources/cachemanager-perf.xml (revision 11330)
@@ -0,0 +1,488 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/config/generator/model/elements/ElementValueComparatorConfigurationElement.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/config/generator/model/elements/ElementValueComparatorConfigurationElement.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/config/generator/model/elements/ElementValueComparatorConfigurationElement.java (revision 11330)
@@ -0,0 +1,55 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+
+package net.sf.ehcache.config.generator.model.elements;
+
+import net.sf.ehcache.config.ElementValueComparatorConfiguration;
+import net.sf.ehcache.config.generator.model.NodeElement;
+import net.sf.ehcache.config.generator.model.SimpleNodeAttribute;
+import net.sf.ehcache.config.generator.model.SimpleNodeElement;
+
+/**
+ * {@link net.sf.ehcache.config.generator.model.NodeElement} representing the
+ * {@link net.sf.ehcache.config.ElementValueComparatorConfiguration}
+ *
+ * @author Ludovic Orban
+ *
+ */
+public class ElementValueComparatorConfigurationElement extends SimpleNodeElement {
+
+ private final ElementValueComparatorConfiguration elementValueComparatorConfiguration;
+
+ /**
+ * Constructor accepting the parent and the {@link net.sf.ehcache.config.ElementValueComparatorConfiguration}
+ *
+ * @param parent
+ * @param elementValueComparatorConfiguration
+ */
+ public ElementValueComparatorConfigurationElement(NodeElement parent,
+ ElementValueComparatorConfiguration elementValueComparatorConfiguration) {
+ super(parent, "elementValueComparator");
+ this.elementValueComparatorConfiguration = elementValueComparatorConfiguration;
+ init();
+ }
+
+ private void init() {
+ if (elementValueComparatorConfiguration == null) {
+ return;
+ }
+ addAttribute(new SimpleNodeAttribute("class", elementValueComparatorConfiguration.getClassName()).optional(false));
+ }
+
+}
Index: rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/net/sf/ehcache/util/RetryAssert.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/net/sf/ehcache/util/RetryAssert.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/net/sf/ehcache/util/RetryAssert.java (revision 11330)
@@ -0,0 +1,80 @@
+/*
+ * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
+ */
+
+package net.sf.ehcache.util;
+
+import net.sf.ehcache.Ehcache;
+import net.sf.ehcache.Element;
+import net.sf.ehcache.store.Store;
+
+import org.hamcrest.Matcher;
+import org.junit.Assert;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
+public class RetryAssert {
+ protected RetryAssert() {
+ // static only class
+ }
+
+ public static void assertBy(long time, TimeUnit unit, Callable value, Matcher matcher) {
+ boolean interrupted = false;
+ long start = System.nanoTime();
+ long end = start + unit.toNanos(time);
+ long sleep = Math.max(50, unit.toMillis(time) / 10);
+ AssertionError latest;
+ try {
+ while (true) {
+ try {
+ Assert.assertThat(value.call(), matcher);
+ return;
+ } catch (AssertionError e) {
+ latest = e;
+ } catch (Exception e) {
+ latest = new AssertionError(e);
+ }
+
+ if (System.nanoTime() > end) {
+ break;
+ } else {
+ try {
+ Thread.sleep(sleep);
+ } catch (InterruptedException e) {
+ interrupted = true;
+ }
+ }
+ }
+ } finally {
+ if (interrupted) {
+ Thread.currentThread().interrupt();
+ }
+ }
+ throw latest;
+ }
+
+ public static Callable elementAt(final Ehcache cache, final Object key) {
+ return new Callable() {
+ public Element call() {
+ return cache.get(key);
+ }
+ };
+ }
+
+ public static Callable sizeOf(final Ehcache cache) {
+ return new Callable() {
+ public Integer call() throws Exception {
+ return cache.getSize();
+ }
+ };
+ }
+
+ public static Callable sizeOnDiskOf(final Store store) {
+ return new Callable() {
+ public Integer call() throws Exception {
+ return store.getOnDiskSize();
+ }
+ };
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/util/LongSequence.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/util/LongSequence.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/util/LongSequence.java (revision 11330)
@@ -0,0 +1,32 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+
+package net.sf.ehcache.util;
+
+/**
+ * A sequence producing longs
+ *
+ * @author teck
+ */
+public interface LongSequence {
+
+ /**
+ * Get the next value in the sequence
+ *
+ * @return the next value
+ */
+ long next();
+}
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/event/CacheEventListenerFactory.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/event/CacheEventListenerFactory.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/event/CacheEventListenerFactory.java (revision 11330)
@@ -0,0 +1,39 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+
+package net.sf.ehcache.event;
+
+import java.util.Properties;
+
+/**
+ * An abstract factory for creating listeners. Implementers should provide their own
+ * concrete factory extending this factory. It can then be configured in ehcache.xml.
+ *
+ * @author Greg Luck
+ * @version $Id: CacheEventListenerFactory.java 5594 2012-05-07 16:04:31Z cdennis $
+ */
+public abstract class CacheEventListenerFactory {
+
+ /**
+ * Create a CacheEventListener
+ *
+ * @param properties implementation specific properties. These are configured as comma
+ * separated name value pairs in ehcache.xml
+ * @return a constructed CacheEventListener
+ */
+ public abstract CacheEventListener createCacheEventListener(Properties properties);
+
+}
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/util/SetAsList.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/util/SetAsList.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/util/SetAsList.java (revision 11330)
@@ -0,0 +1,212 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+
+package net.sf.ehcache.util;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Set;
+
+/**
+ * Wraps a set to provide a list interface.
+ * All list methods not application to set throws an {@link UnsupportedOperationException}
+ *
+ * @author Chris Dennis
+ * @param
+ */
+public class SetAsList implements List {
+
+ private final Set set;
+ private transient Object[] array;
+
+ /**
+ * @param set
+ */
+ public SetAsList(Set set) {
+ this.set = set;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int size() {
+ return set.size();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isEmpty() {
+ return set.isEmpty();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean contains(Object o) {
+ return set.contains(o);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Iterator iterator() {
+ return set.iterator();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object[] toArray() {
+ return set.toArray();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public T[] toArray(T[] a) {
+ return set.toArray(a);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean add(E e) {
+ return set.add(e);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean remove(Object o) {
+ return set.remove(o);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean containsAll(Collection c) {
+ return set.containsAll(c);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean addAll(Collection c) {
+ return set.addAll(c);
+ }
+
+ /**
+ * Does not support List methods {@link UnsupportedOperationException}.
+ */
+ public boolean addAll(int index, Collection c) {
+ throw new UnsupportedOperationException("Delegates to set, operation not supported");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean removeAll(Collection c) {
+ return set.removeAll(c);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean retainAll(Collection c) {
+ return set.retainAll(c);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void clear() {
+ set.clear();
+ }
+
+ /**
+ * Does not support List methods {@link UnsupportedOperationException}.
+ *
+ * @param index Index
+ */
+ public E get(int index) {
+ if (this.array == null) {
+ this.array = toArray();
+ }
+ if (array.length <= index) {
+ throw new IndexOutOfBoundsException();
+ }
+ return (E) this.array[index];
+ }
+
+ /**
+ * Does not support List methods {@link UnsupportedOperationException}.
+ */
+ public E set(int index, E element) {
+ throw new UnsupportedOperationException("Delegates to set, operation not supported");
+ }
+
+ /**
+ * Does not support List methods {@link UnsupportedOperationException}.
+ */
+ public void add(int index, E element) {
+ throw new UnsupportedOperationException("Delegates to set, operation not supported");
+ }
+
+ /**
+ * Does not support List methods {@link UnsupportedOperationException}.
+ */
+ public E remove(int index) {
+ throw new UnsupportedOperationException("Delegates to set, operation not supported");
+ }
+
+ /**
+ * Does not support List methods {@link UnsupportedOperationException}.
+ */
+ public int indexOf(Object o) {
+ throw new UnsupportedOperationException("Delegates to set, operation not supported");
+ }
+
+ /**
+ * Does not support List methods {@link UnsupportedOperationException}.
+ */
+ public int lastIndexOf(Object o) {
+ throw new UnsupportedOperationException("Delegates to set, operation not supported");
+ }
+
+ /**
+ * Does not support List methods {@link UnsupportedOperationException}.
+ */
+ public ListIterator listIterator() {
+ throw new UnsupportedOperationException("Delegates to set, operation not supported");
+ }
+
+ /**
+ * Does not support List methods {@link UnsupportedOperationException}.
+ */
+ public ListIterator listIterator(int index) {
+ throw new UnsupportedOperationException("Delegates to set, operation not supported");
+ }
+
+ /**
+ * Does not support List methods {@link UnsupportedOperationException}.
+ */
+ public List subList(int fromIndex, int toIndex) {
+ throw new UnsupportedOperationException("Delegates to set, operation not supported");
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/pool/sizeof/filter/annotations/CustomAnnotation.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/pool/sizeof/filter/annotations/CustomAnnotation.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/pool/sizeof/filter/annotations/CustomAnnotation.java (revision 11330)
@@ -0,0 +1,32 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+
+package net.sf.ehcache.pool.sizeof.filter.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.TYPE, ElementType.PACKAGE })
+public @interface CustomAnnotation {
+ boolean deprecated() default true;
+ short differentReturnType() default 10;
+ Class aClass() default Integer.class;
+ ExampleEnum anEnum() default ExampleEnum.TWO;
+ Deprecated anAnnotation() default @Deprecated;
+}
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/search/attribute/JavaBeanAttributeExtractor.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/search/attribute/JavaBeanAttributeExtractor.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/search/attribute/JavaBeanAttributeExtractor.java (revision 11330)
@@ -0,0 +1,163 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+
+package net.sf.ehcache.search.attribute;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import net.sf.ehcache.Element;
+
+/**
+ * Extracts a search attribute determining the value as a javabean property on either
+ * the key or the value. If the property exists on both the key and the value an exception is thrown
+ *
+ * @author teck
+ */
+public class JavaBeanAttributeExtractor implements AttributeExtractor {
+
+ private static final Object NO_VALUE = new Object();
+
+ private transient volatile MethodRef lastKeyMethod;
+ private transient volatile MethodRef lastValueMethod;
+
+ private final String beanProperty;
+
+ /**
+ * Constructor
+ *
+ * @param beanProperty the bean property name to extract
+ */
+ public JavaBeanAttributeExtractor(String beanProperty) {
+ if (beanProperty == null) {
+ throw new NullPointerException();
+ }
+
+ beanProperty = beanProperty.trim();
+
+ if (beanProperty.length() == 0) {
+ throw new IllegalArgumentException("bean property empty");
+ }
+
+ this.beanProperty = beanProperty;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object attributeFor(Element element, String attributeName) throws AttributeExtractorException {
+ Object attribute = NO_VALUE;
+
+ final Object key = element.getObjectKey();
+
+ if (key != null) {
+ MethodRef keyMethod = lastKeyMethod;
+ if (keyMethod == null || keyMethod.targetClass != key.getClass()) {
+ keyMethod = findMethod(key);
+ lastKeyMethod = keyMethod;
+ }
+ if (keyMethod.method != null) {
+ attribute = getValue(keyMethod.method, key);
+ }
+ }
+
+ final Object value = element.getObjectValue();
+
+ if (value != null) {
+ MethodRef valueMethod = lastValueMethod;
+ if (valueMethod == null || valueMethod.targetClass != value.getClass()) {
+ valueMethod = findMethod(value);
+ lastValueMethod = valueMethod;
+ }
+
+ if (valueMethod.method != null) {
+ if (attribute != NO_VALUE) {
+ throw new AttributeExtractorException("Bean property [" + beanProperty + "] present on both key and value");
+ }
+
+ return getValue(valueMethod.method, value);
+ }
+ }
+
+ if (attribute != NO_VALUE) {
+ return attribute;
+ }
+
+ throw new AttributeExtractorException("Bean property [" + beanProperty + "] not present on either key or value");
+ }
+
+ private MethodRef findMethod(Object obj) {
+ String upperFirstProp = "" + Character.toUpperCase(beanProperty.charAt(0));
+ if (beanProperty.length() > 1) {
+ upperFirstProp += beanProperty.substring(1);
+ }
+
+ final Class target = obj.getClass();
+
+ try {
+ return new MethodRef(target, target.getMethod("get" + upperFirstProp));
+ } catch (SecurityException e) {
+ throw new AttributeExtractorException(e);
+ } catch (NoSuchMethodException e) {
+ // keep looking
+ }
+
+ try {
+ Method m = target.getMethod("is" + upperFirstProp);
+ if (m.getReturnType().equals(Boolean.class) || m.getReturnType().equals(Boolean.TYPE)) {
+ return new MethodRef(target, m);
+ }
+ } catch (SecurityException e) {
+ throw new AttributeExtractorException(e);
+ } catch (NoSuchMethodException e) {
+ //
+ }
+
+ // no applicable method available
+ return new MethodRef(target, null);
+ }
+
+ private Object getValue(Method method, Object key) {
+ try {
+ return method.invoke(key);
+ } catch (Throwable t) {
+ if (t instanceof InvocationTargetException) {
+ t = t.getCause();
+ }
+
+ if (t instanceof Error) {
+ throw ((Error) t);
+ }
+
+ throw new AttributeExtractorException("Error getting bean property [" + beanProperty + "] on instance of "
+ + key.getClass().getName(), t);
+ }
+ }
+
+ /**
+ * A cached method lookup. Method is null to indicate the method is not present/accessible
+ */
+ private static class MethodRef {
+ private final Class targetClass;
+ private final Method method;
+
+ MethodRef(Class target, Method method) {
+ this.targetClass = target;
+ this.method = method;
+ }
+ }
+
+}
Index: rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/net/sf/ehcache/osgi/SimpleOsgiTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/net/sf/ehcache/osgi/SimpleOsgiTest.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/net/sf/ehcache/osgi/SimpleOsgiTest.java (revision 11330)
@@ -0,0 +1,126 @@
+/*
+ * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
+ */
+package net.sf.ehcache.osgi;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackages;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.terracotta.test.OsgiUtil.commonOptions;
+import static org.terracotta.test.OsgiUtil.getMavenBundle;
+
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.CacheManager;
+import net.sf.ehcache.Element;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
+import org.terracotta.context.ContextManager;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Serializable;
+import java.net.URL;
+
+/**
+ * Test a simple BigMemory usage with BM Go license key. The product name should include "BigMemory" and not "Ehcache"
+ * NOTE: this test only works in fullmode
+ *
+ * @author hhuynh
+ */
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
+public class SimpleOsgiTest {
+
+ @Configuration
+ public Option[] config() {
+ return options(bootDelegationPackages("sun.*,jdk.*"),
+ // need this for REST agent test
+ getMavenBundle("net.sf.ehcache", "ehcache-ee", "ehcache"),
+ commonOptions());
+ }
+
+ @Test
+ public void testSimpleCache() throws Exception {
+ CacheManager manager = new CacheManager(SimpleOsgiTest.class.getResource("/net/sf/ehcache/osgi/simple-ehcache.xml"));
+ try {
+ Cache cache = manager.getCache("sampleCache1");
+ Element element = new Element("key1", "value1");
+ cache.put(element);
+ Element element1 = cache.get("key1");
+ assertEquals("value1", element1.getObjectValue());
+ assertEquals(1, cache.getSize());
+ } finally {
+ manager.shutdown();
+ }
+ }
+
+ @Test
+ public void testValueClass() throws Exception {
+ CacheManager manager = new CacheManager(SimpleOsgiTest.class.getResource("/net/sf/ehcache/osgi/simple-ehcache.xml"));
+ try {
+ Cache cache = manager.getCache("sampleCache1");
+ Element element = new Element("key1", new Value("value1"));
+ cache.put(element);
+ Element element1 = cache.get("key1");
+ assertEquals("value1", ((Value) element1.getObjectValue()).v);
+ assertEquals(1, cache.getSize());
+ } finally {
+ manager.shutdown();
+ }
+ }
+
+ @Test
+ public void testUsingNonExportedClass() {
+ try {
+ ContextManager cm = new ContextManager();
+ fail("Expected class not found exception");
+ } catch (Throwable e) {
+ // expected
+ }
+ }
+
+ @Test
+ public void testRestAgent() throws Exception {
+ CacheManager manager = new CacheManager(
+ SimpleOsgiTest.class
+ .getResource("/net/sf/ehcache/osgi/rest-enabled-ehcache.xml"));
+ InputStream in = null;
+ try {
+ Cache testCache = manager.getCache("testCache");
+ testCache.put(new Element("k", "v"));
+ assertEquals(1, testCache.getSize());
+ URL url = new URL("http://localhost:9888/tc-management-api/agents");
+ in = url.openStream();
+ BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+ String line = null;
+ StringBuilder sb = new StringBuilder();
+ while ((line = reader.readLine()) != null) {
+ sb.append(line.trim()).append("\n");
+ }
+ System.out.println("Rest response: " + sb);
+ assertTrue(sb.toString().contains("\"agentId\":\"embedded\""));
+ } finally {
+ manager.shutdown();
+ if (in != null) {
+ in.close();
+ }
+ }
+ }
+
+ private static class Value implements Serializable {
+ public String v;
+
+ public Value(String value) {
+ v = value;
+ }
+ }
+}
\ No newline at end of file
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/writer/writebehind/OperationConverter.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/writer/writebehind/OperationConverter.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/writer/writebehind/OperationConverter.java (revision 11330)
@@ -0,0 +1,34 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+package net.sf.ehcache.writer.writebehind;
+
+/**
+ * Interface that allows an converter to be implemented that can create an operation based
+ * on an arbitrary object.
+ *
+ * @param the operation type that should be converted to
+ * @author Geert Bevin
+ * @version $Id: OperationConverter.java 5594 2012-05-07 16:04:31Z cdennis $
+ */
+public interface OperationConverter {
+ /**
+ * Convert an arbitrary object
+ *
+ * @param source the object to convert
+ * @return the converted operation instance
+ */
+ public T convert(Object source);
+}
Index: rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapL2EvictionReachesL1Test.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapL2EvictionReachesL1Test.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/org/terracotta/ehcache/tests/servermap/ServerMapL2EvictionReachesL1Test.java (revision 11330)
@@ -0,0 +1,21 @@
+package org.terracotta.ehcache.tests.servermap;
+
+import org.terracotta.ehcache.tests.AbstractCacheTestBase;
+
+import com.tc.test.config.model.TestConfig;
+
+public class ServerMapL2EvictionReachesL1Test extends AbstractCacheTestBase {
+
+ public ServerMapL2EvictionReachesL1Test(TestConfig testConfig) {
+ super("/servermap/servermap-l2-eviction-reaches-l1-test.xml", testConfig,
+ ServerMapL2EvictionReachesL1TestClient.class);
+ testConfig.setDgcEnabled(true);
+ testConfig.setDgcIntervalInSec(60);
+ testConfig.addTcProperty("ehcache.evictor.logging.enabled", "true");
+
+ testConfig.getClientConfig().addExtraClientJvmArg("-Dcom.tc.l1.cachemanager.enabled=false");
+ testConfig.getClientConfig().addExtraClientJvmArg("-Dcom.tc.ehcache.evictor.logging.enabled=true");
+ testConfig.getClientConfig().addExtraClientJvmArg("-Dcom.tc.l1.lockmanager.timeout.interval=60000");
+ }
+
+}
Index: rctags/ehcache-2.10.9.0.363/distribution/events/src/assemble/bin/stop-sample.bat
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/distribution/events/src/assemble/bin/stop-sample.bat (revision 0)
+++ rctags/ehcache-2.10.9.0.363/distribution/events/src/assemble/bin/stop-sample.bat (revision 11330)
@@ -0,0 +1,13 @@
+@echo off
+
+setlocal
+
+set root=%~d0%~p0..
+set root="%root:"=%"
+
+cd %root%
+
+call bin/stop-jetty.bat 9081
+call bin/stop-jetty.bat 9082
+
+endlocal
\ No newline at end of file
Index: rctags/ehcache-2.10.9.0.363/management-ehcache-v1/src/main/java/net/sf/ehcache/management/resource/CacheManagerConfigEntity.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/management-ehcache-v1/src/main/java/net/sf/ehcache/management/resource/CacheManagerConfigEntity.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/management-ehcache-v1/src/main/java/net/sf/ehcache/management/resource/CacheManagerConfigEntity.java (revision 11330)
@@ -0,0 +1,39 @@
+package net.sf.ehcache.management.resource;
+
+import org.terracotta.management.resource.VersionedEntity;
+
+/**
+ * @author brandony
+ */
+public class CacheManagerConfigEntity extends VersionedEntity {
+ private String cacheManagerName;
+ private String agentId;
+
+ private String xml;
+
+ public String getCacheManagerName() {
+ return cacheManagerName;
+ }
+
+ public void setCacheManagerName(String cacheManagerName) {
+ this.cacheManagerName = cacheManagerName;
+ }
+
+ public String getXml() {
+ return xml;
+ }
+
+ public void setXml(String xml) {
+ this.xml = xml;
+ }
+
+ @Override
+ public String getAgentId() {
+ return agentId;
+ }
+
+ @Override
+ public void setAgentId(String agentId) {
+ this.agentId = agentId;
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/system-tests/src/test/resources/servermap/servermap-l2-eviction-reaches-l1-test.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/system-tests/src/test/resources/servermap/servermap-l2-eviction-reaches-l1-test.xml (revision 0)
+++ rctags/ehcache-2.10.9.0.363/system-tests/src/test/resources/servermap/servermap-l2-eviction-reaches-l1-test.xml (revision 11330)
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: rctags/ehcache-2.10.9.0.363/management-ehcache-v2/src/main/java/net/sf/ehcache/management/resource/CacheStatisticSampleEntityV2.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/management-ehcache-v2/src/main/java/net/sf/ehcache/management/resource/CacheStatisticSampleEntityV2.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/management-ehcache-v2/src/main/java/net/sf/ehcache/management/resource/CacheStatisticSampleEntityV2.java (revision 11330)
@@ -0,0 +1,33 @@
+/*
+ * All content copyright (c) 2003-2012 Terracotta, Inc., except as may otherwise be noted in a separate copyright
+ * notice. All rights reserved.
+ */
+package net.sf.ehcache.management.resource;
+
+import java.util.Map;
+
+/**
+ * @author brandony
+ */
+public class CacheStatisticSampleEntityV2 extends AbstractCacheEntityV2{
+
+ private String statName;
+
+ private Map statValueByTimeMillis;
+
+ public String getStatName() {
+ return statName;
+ }
+
+ public void setStatName(String statName) {
+ this.statName = statName;
+ }
+
+ public Map getStatValueByTimeMillis() {
+ return statValueByTimeMillis;
+ }
+
+ public void setStatValueByTimeMillis(Map statValueByTimeMillis) {
+ this.statValueByTimeMillis = statValueByTimeMillis;
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/util/counter/sampled/TimeStampedCounterValue.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/util/counter/sampled/TimeStampedCounterValue.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/util/counter/sampled/TimeStampedCounterValue.java (revision 11330)
@@ -0,0 +1,68 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+
+package net.sf.ehcache.util.counter.sampled;
+
+import java.io.Serializable;
+
+/**
+ * A counter value at a particular time instance
+ *
+ * @author Abhishek Sanoujam
+ * @since 1.7
+ */
+public class TimeStampedCounterValue implements Serializable {
+ private final long counterValue;
+ private final long timestamp;
+
+ /**
+ * Constructor accepting the value of both timestamp and the counter value.
+ *
+ * @param timestamp
+ * @param value
+ */
+ public TimeStampedCounterValue(long timestamp, long value) {
+ this.timestamp = timestamp;
+ this.counterValue = value;
+ }
+
+ /**
+ * Get the counter value
+ *
+ * @return The counter value
+ */
+ public long getCounterValue() {
+ return this.counterValue;
+ }
+
+ /**
+ * Get value of the timestamp
+ *
+ * @return the timestamp associated with the current value
+ */
+ public long getTimestamp() {
+ return this.timestamp;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ return "value: " + this.counterValue + ", timestamp: " + this.timestamp;
+ }
+
+}
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/config/generator/xsom/XSDAttributeValueType.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/config/generator/xsom/XSDAttributeValueType.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/config/generator/xsom/XSDAttributeValueType.java (revision 11330)
@@ -0,0 +1,264 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+
+package net.sf.ehcache.config.generator.xsom;
+
+import net.sf.ehcache.config.MemoryUnit;
+
+import java.util.Iterator;
+import java.util.Random;
+
+import com.sun.xml.xsom.XSAttributeDecl;
+import com.sun.xml.xsom.XSFacet;
+import com.sun.xml.xsom.XSRestrictionSimpleType;
+import com.sun.xml.xsom.XSSimpleType;
+
+public abstract class XSDAttributeValueType {
+
+ protected static final Random RANDOM = new Random(System.currentTimeMillis());
+ protected String pattern;
+ public enum XsdType {
+ BOOLEAN, INTEGER, POSITIVE_INTEGER, NON_NEGATIVE_INTEGER, STRING, ANY_SIMPLE_TYPE, ENUMERATION;
+ }
+ protected String maxValue;
+ protected String minValue;
+ protected String length;
+ protected String maxLength;
+ protected String minLength;
+
+ protected String totalDigits;
+
+ private final XsdType type;
+
+ public XSDAttributeValueType(XsdType type) {
+ this.type = type;
+ }
+
+ public abstract String getRandomAllowedValue();
+
+ protected void fillUpRestrictions(XSAttributeDecl attributeDecl) {
+ XSSimpleType localType = attributeDecl.getType();
+ XSRestrictionSimpleType restriction = localType.asRestriction();
+ if (restriction != null) {
+ Iterator i = restriction.getDeclaredFacets().iterator();
+ while (i.hasNext()) {
+ XSFacet facet = i.next();
+ if (facet.getName().equals(XSFacet.FACET_MAXINCLUSIVE)) {
+ maxValue = facet.getValue().value;
+ }
+ if (facet.getName().equals(XSFacet.FACET_MININCLUSIVE)) {
+ minValue = facet.getValue().value;
+ }
+ if (facet.getName().equals(XSFacet.FACET_MAXEXCLUSIVE)) {
+ maxValue = String.valueOf(Integer.parseInt(facet.getValue().value) - 1);
+ }
+ if (facet.getName().equals(XSFacet.FACET_MINEXCLUSIVE)) {
+ minValue = String.valueOf(Integer.parseInt(facet.getValue().value) + 1);
+ }
+ if (facet.getName().equals(XSFacet.FACET_LENGTH)) {
+ length = facet.getValue().value;
+ }
+ if (facet.getName().equals(XSFacet.FACET_MAXLENGTH)) {
+ maxLength = facet.getValue().value;
+ }
+ if (facet.getName().equals(XSFacet.FACET_MINLENGTH)) {
+ minLength = facet.getValue().value;
+ }
+ if (facet.getName().equals(XSFacet.FACET_PATTERN)) {
+ pattern = facet.getValue().value;
+ }
+ if (facet.getName().equals(XSFacet.FACET_TOTALDIGITS)) {
+ totalDigits = facet.getValue().value;
+ }
+ }
+ }
+ }
+
+ public static class XSDAttributeValueBooleanType extends XSDAttributeValueType {
+
+ public XSDAttributeValueBooleanType() {
+ super(XsdType.BOOLEAN);
+ }
+
+ @Override
+ public String getRandomAllowedValue() {
+ return RANDOM.nextInt() % 2 == 0 ? getTrue() : getFalse();
+ }
+
+ public String getTrue() {
+ return String.valueOf(true);
+ }
+
+ public String getFalse() {
+ return String.valueOf(false);
+ }
+
+ }
+
+ public static class XSDAttributeValueIntegerType extends XSDAttributeValueType {
+
+ public XSDAttributeValueIntegerType() {
+ super(XsdType.INTEGER);
+ }
+
+ @Override
+ public String getRandomAllowedValue() {
+ return String.valueOf(RANDOM.nextInt());
+ }
+
+ }
+
+ public static class XSDAttributeValuePositiveIntegerType extends XSDAttributeValueType {
+
+ public XSDAttributeValuePositiveIntegerType() {
+ super(XsdType.POSITIVE_INTEGER);
+ }
+
+ @Override
+ public String getRandomAllowedValue() {
+ return String.valueOf(Math.abs(RANDOM.nextInt() + 1));
+ }
+
+ }
+
+ public static class XSDAttributeValueNonNegativeIntegerType extends XSDAttributeValueType {
+
+ public XSDAttributeValueNonNegativeIntegerType() {
+ super(XsdType.NON_NEGATIVE_INTEGER);
+ }
+
+ @Override
+ public String getRandomAllowedValue() {
+ return String.valueOf(Math.abs(RANDOM.nextInt()));
+ }
+
+ }
+
+ public static class XSDAttributeValueMemoryUnitType extends XSDAttributeValueType {
+
+ public static final char[] unitChars;
+
+ static {
+ MemoryUnit[] values = MemoryUnit.values();
+ char [] chars = new char[values.length * 2];
+ int i = 0;
+ for (MemoryUnit memoryUnit : values) {
+ chars[i++] = Character.toLowerCase(memoryUnit.getUnit());
+ chars[i++] = Character.toUpperCase(memoryUnit.getUnit());
+ }
+ unitChars = chars;
+ }
+
+ public XSDAttributeValueMemoryUnitType() {
+ super(XsdType.NON_NEGATIVE_INTEGER);
+ }
+
+ @Override
+ public String getRandomAllowedValue() {
+ int index = RANDOM.nextInt(unitChars.length + 1);
+ if(index < unitChars.length) {
+ return String.valueOf(Math.abs(RANDOM.nextInt())) + unitChars[index];
+ }
+ return String.valueOf(Math.abs(RANDOM.nextInt()));
+ }
+
+ }
+
+ public static class XSDAttributeValueMemoryUnitOrPercentageType extends XSDAttributeValueType {
+
+ public static final char[] unitChars;
+
+ static {
+ MemoryUnit[] values = MemoryUnit.values();
+ char [] chars = new char[values.length * 2 + 1];
+ int i = 0;
+ for (MemoryUnit memoryUnit : values) {
+ chars[i++] = Character.toLowerCase(memoryUnit.getUnit());
+ chars[i++] = Character.toUpperCase(memoryUnit.getUnit());
+ }
+ chars[i] = '%';
+ unitChars = chars;
+ }
+
+ public XSDAttributeValueMemoryUnitOrPercentageType() {
+ super(XsdType.NON_NEGATIVE_INTEGER);
+ }
+
+ @Override
+ public String getRandomAllowedValue() {
+ int index = RANDOM.nextInt(unitChars.length + 1);
+ if(index < unitChars.length) {
+ switch (unitChars[index]) {
+ case '%' :
+ return String.valueOf(Math.abs(RANDOM.nextInt(100) + 1)) + unitChars[index];
+ default:
+ return String.valueOf(Math.abs(RANDOM.nextInt())) + unitChars[index];
+ }
+ }
+ return String.valueOf(Math.abs(RANDOM.nextInt()));
+ }
+
+ }
+
+ public static class XSDAttributeValueStringType extends XSDAttributeValueType {
+
+ private static final String[] RANDOM_VALUES = {"random_string_one", "random_string_two", "random_string_three", "random_string_four",
+ "random_string_five", };
+
+ public XSDAttributeValueStringType() {
+ super(XsdType.STRING);
+ }
+
+ @Override
+ public String getRandomAllowedValue() {
+ return RANDOM_VALUES[RANDOM.nextInt(RANDOM_VALUES.length)];
+ }
+
+ }
+
+ public static class XSDAttributeValueAnySimpleType extends XSDAttributeValueType {
+
+ private static final String[] RANDOM_VALUES = {"any_simple_type_random_one", "any_simple_type_random_two",
+ "any_simple_type_random_three", "any_simple_type_random_four", "any_simple_type_random_five", };
+
+ public XSDAttributeValueAnySimpleType() {
+ super(XsdType.ANY_SIMPLE_TYPE);
+ }
+
+ @Override
+ public String getRandomAllowedValue() {
+ return RANDOM_VALUES[RANDOM.nextInt(RANDOM_VALUES.length)];
+ }
+
+ }
+
+ public static class XSDAttributeValueEnumerationType extends XSDAttributeValueType {
+
+ private final String[] enumeration;
+
+ public XSDAttributeValueEnumerationType(String[] enumeration) {
+ super(XsdType.ENUMERATION);
+ this.enumeration = enumeration;
+ }
+
+ @Override
+ public String getRandomAllowedValue() {
+ return enumeration[RANDOM.nextInt(enumeration.length)];
+ }
+
+ }
+
+}
Index: rctags/ehcache-2.10.9.0.363/ehcache/src/test/java/net/sf/ehcache/terracotta/upgradability/serialization/ClusteredTransactionIDSerializationTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache/src/test/java/net/sf/ehcache/terracotta/upgradability/serialization/ClusteredTransactionIDSerializationTest.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache/src/test/java/net/sf/ehcache/terracotta/upgradability/serialization/ClusteredTransactionIDSerializationTest.java (revision 11330)
@@ -0,0 +1,59 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+
+package net.sf.ehcache.terracotta.upgradability.serialization;
+
+import java.lang.reflect.Field;
+import java.util.Comparator;
+import java.util.Map;
+
+import net.sf.ehcache.CacheManager;
+import net.sf.ehcache.transaction.TransactionIDFactory;
+import net.sf.ehcache.transaction.TransactionIDSerializedForm;
+import org.junit.Test;
+import org.terracotta.modules.ehcache.transaction.ClusteredTransactionID;
+
+import static org.mockito.Matchers.refEq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.terracotta.upgradability.serialization.SerializationUpgradabilityTesting.validateSerializedForm;
+
+/**
+ *
+ * @author cdennis
+ */
+public class ClusteredTransactionIDSerializationTest {
+
+ private static final Comparator COMPARATOR = new Comparator() {
+ @Override
+ public int compare(ClusteredTransactionID o1, ClusteredTransactionID o2) {
+ return o1.equals(o2) && o1.getOwnerID().equals(o2.getOwnerID()) ? 0 : -1;
+ }
+ };
+
+ @Test
+ public void testBasic() throws Exception {
+ Field MANAGERS_MAP = CacheManager.class.getDeclaredField("CACHE_MANAGERS_MAP");
+ MANAGERS_MAP.setAccessible(true);
+ CacheManager manager = mock(CacheManager.class);
+ ((Map) MANAGERS_MAP.get(null)).put("manager", manager);
+ TransactionIDFactory txnIdFactory = mock(TransactionIDFactory.class);
+ when(txnIdFactory.restoreTransactionID(refEq(new TransactionIDSerializedForm("manager", "cluster", "owner", 42L, 2))))
+ .thenReturn(new ClusteredTransactionID("owner", "cluster", "manager", 42L, 2));
+ when(manager.getOrCreateTransactionIDFactory()).thenReturn(txnIdFactory);
+ validateSerializedForm(new ClusteredTransactionID("owner", "cluster", "manager", 42L, 2), COMPARATOR, "serializedforms/ClusteredTransactionIDSerializationTest.testBasic.ser");
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/org/terracotta/modules/ehcache/store/BlockingCacheTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/org/terracotta/modules/ehcache/store/BlockingCacheTest.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/org/terracotta/modules/ehcache/store/BlockingCacheTest.java (revision 11330)
@@ -0,0 +1,135 @@
+/*
+ * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
+ */
+package org.terracotta.modules.ehcache.store;
+
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.CacheException;
+import net.sf.ehcache.Ehcache;
+import net.sf.ehcache.Element;
+import net.sf.ehcache.constructs.blocking.BlockingCache;
+
+import org.terracotta.ehcache.tests.AbstractCacheTestBase;
+import org.terracotta.ehcache.tests.ClientBase;
+import org.terracotta.toolkit.Toolkit;
+import org.terracotta.toolkit.concurrent.ToolkitBarrier;
+
+import com.tc.test.config.model.TestConfig;
+
+import java.io.Serializable;
+
+import junit.framework.Assert;
+
+/**
+ * @author Alex Snaps
+ */
+public class BlockingCacheTest extends AbstractCacheTestBase {
+
+ public BlockingCacheTest(TestConfig testConfig) {
+ super("blocking-cache.xml", testConfig, App.class, App.class, App.class);
+ }
+
+ public static class App extends ClientBase {
+ private static final String KEY_1 = "funkyKey";
+ private static final Serializable VALUE_1 = "A really cool value";
+ private static final String KEY_2 = "otherFunkyKey";
+ private static final Serializable VALUE_2 = "Even cooler value";
+ private static final String KEY_3 = "theUeberFunkyKey";
+ private static final Serializable VALUE_3 = "can't get any cooler value";
+ private final ToolkitBarrier barrier;
+
+ public App(String[] args) {
+ super("test1", args);
+ this.barrier = getClusteringToolkit().getBarrier("test-barrier", getParticipantCount());
+ }
+
+ public static void main(String[] args) {
+ new App(args).run();
+ }
+
+ @Override
+ protected void runTest(Cache testcache, Toolkit clusteringToolkit) throws Throwable {
+ final int index = barrier.await();
+
+ Ehcache cache = cacheManager.getCache("test1");
+ Assert.assertNotNull("There should be a cache test from that manager!", cache);
+ BlockingCache blockingCache = new BlockingCache(cache);
+ cacheManager.replaceCacheWithDecoratedCache(cache, blockingCache);
+ cache = cacheManager.getEhcache("test1");
+
+ if (index == 0) {
+ // Node 0 blocks all other read to the key
+ Assert.assertNull("Key " + KEY_1 + " should not be present in the cache yet", cache.get(KEY_1));
+ cache.put(new Element(KEY_2, VALUE_2));
+ }
+
+ barrier.await();
+
+ if (index != 0) {
+ // This call should block, until node 0 puts en element for KEY in the cache
+ Element element = cache.get(KEY_1);
+ Assert.assertNotNull("Node 0 should have put key " + KEY_1 + " in the cache", element);
+ Assert.assertEquals("Value for key " + KEY_1 + " should be " + VALUE_1, VALUE_1, element.getValue());
+ } else {
+ Thread.sleep(2000); // Thinking about the meaning of life for a while
+ cache.put(new Element(KEY_1, VALUE_1));
+ }
+ Element element = cache.get(KEY_2);
+ Assert.assertNotNull(element);
+ Assert.assertEquals("Value for key " + KEY_2 + " should be " + VALUE_2, VALUE_2, element.getValue());
+
+ barrier.await();
+
+ blockingCache.setTimeoutMillis(3000);
+ if (index == 0) {
+ // Should block all other get to the same key
+ cache.get(KEY_3);
+ }
+
+ barrier.await();
+
+ switch (index) {
+ case 2:
+ Thread.sleep(2000);
+ Assert.assertNotNull(cache.get(KEY_3));
+ break;
+ case 1:
+ try {
+ cache.get(KEY_3);
+ Assert.fail();
+ } catch (CacheException e) {
+ // We failed aquiring the lock
+ }
+ break;
+ case 0:
+ Thread.sleep(3500);
+ cache.put(new Element(KEY_3, VALUE_3));
+ break;
+ }
+
+ barrier.await();
+
+ // This tests inline eviction (EHC-420)
+ Thread.sleep(22000);
+
+ switch (index) {
+ case 0:
+ Assert.assertNull(cache.get(KEY_3));
+ break;
+ }
+
+ barrier.await();
+ blockingCache.setTimeoutMillis(10000);
+ switch (index) {
+ case 0:
+ Thread.sleep(1500);
+ cache.put(new Element(KEY_3, VALUE_3));
+ break;
+ default:
+ Assert.assertNotNull(cache.get(KEY_3));
+ Assert.assertEquals(VALUE_3, cache.get(KEY_3).getValue());
+ }
+ }
+
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/system-tests/src/test/resources/basic-dcv2-cache-test.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/system-tests/src/test/resources/basic-dcv2-cache-test.xml (revision 0)
+++ rctags/ehcache-2.10.9.0.363/system-tests/src/test/resources/basic-dcv2-cache-test.xml (revision 11330)
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: rctags/ehcache-2.10.9.0.363/management-ehcache-impl/management-ehcache-common/impl/CacheManagerConfigurationEntityBuilderV2.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/management-ehcache-impl/management-ehcache-common/impl/CacheManagerConfigurationEntityBuilderV2.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/management-ehcache-impl/management-ehcache-common/impl/CacheManagerConfigurationEntityBuilderV2.java (revision 11330)
@@ -0,0 +1,57 @@
+/*
+ * All content copyright (c) 2003-2012 Terracotta, Inc., except as may otherwise be noted in a separate copyright
+ * notice. All rights reserved.
+ */
+package net.sf.ehcache.management.service.impl;
+
+import net.sf.ehcache.management.resource.CacheManagerConfigEntityV2;
+import net.sf.ehcache.management.sampled.CacheManagerSampler;
+
+import org.terracotta.management.resource.AgentEntityV2;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @author brandony
+ */
+final class CacheManagerConfigurationEntityBuilderV2 {
+ private final List cmSamplers = new ArrayList();
+
+ static CacheManagerConfigurationEntityBuilderV2 createWith(CacheManagerSampler sampler) {
+ return new CacheManagerConfigurationEntityBuilderV2(sampler);
+ }
+
+ private CacheManagerConfigurationEntityBuilderV2(CacheManagerSampler sampler) {
+ addSampler(sampler);
+ }
+
+ CacheManagerConfigurationEntityBuilderV2 add(CacheManagerSampler sampler) {
+ addSampler(sampler);
+ return this;
+ }
+
+ Collection build() {
+ Collection cmces = new ArrayList(cmSamplers.size());
+
+ for (CacheManagerSampler sampler : cmSamplers) {
+ CacheManagerConfigEntityV2 cmce = new CacheManagerConfigEntityV2();
+ cmce.setCacheManagerName(sampler.getName());
+ cmce.setAgentId(AgentEntityV2.EMBEDDED_AGENT_ID);
+ // cmce.setVersion(this.getClass().getPackage().getImplementationVersion());
+ cmce.setXml(sampler.generateActiveConfigDeclaration());
+
+ cmces.add(cmce);
+ }
+
+ return cmces;
+ }
+
+ private void addSampler(CacheManagerSampler sampler) {
+ if (sampler == null) {
+ throw new IllegalArgumentException("sampler == null");
+ }
+ cmSamplers.add(sampler);
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/org/terracotta/ehcache/tests/AbstractWriteBehindAtomicityTestBase.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/org/terracotta/ehcache/tests/AbstractWriteBehindAtomicityTestBase.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/system-tests/src/test/java/org/terracotta/ehcache/tests/AbstractWriteBehindAtomicityTestBase.java (revision 11330)
@@ -0,0 +1,73 @@
+/*
+ * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
+ */
+package org.terracotta.ehcache.tests;
+
+import org.terracotta.tests.base.AbstractClientBase;
+
+import com.tc.test.config.model.TestConfig;
+import com.tc.util.Assert;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+
+public abstract class AbstractWriteBehindAtomicityTestBase extends AbstractCacheTestBase {
+
+ public AbstractWriteBehindAtomicityTestBase(final String ehcacheConfigPath, TestConfig testConfig,
+ Class... c) {
+ super(ehcacheConfigPath, testConfig, c);
+ testConfig.getClientConfig().getBytemanConfig().setScript("/byteman/writeBehindAtomicity.btm");
+ // disableTest();
+ }
+
+ // 1) Begin putWithWriter
+ // 2) lock() putWithWriter
+ // 3) Begin Transaction
+ // 4) Commit Transaction
+ // 5) unlock() putWithWriter
+ // 6) Done putWithWriter
+ @Override
+ protected void evaluateClientOutput(String clientName, int exitCode, File output) throws Throwable {
+ super.evaluateClientOutput(clientName, exitCode, output);
+ int txnCount = 0;
+ boolean underExplicitLock = false;
+ FileReader fr = null;
+ BufferedReader reader = null;
+ try {
+ fr = new FileReader(output);
+ reader = new BufferedReader(fr);
+ String st = "";
+ while ((st = reader.readLine()) != null) {
+ // only check for main thread
+ if (st.contains("main")) {
+ if (st.contains("BEGINOPERATION")) {
+ Assert.assertEquals(false, underExplicitLock);
+ underExplicitLock = true;
+ } else if (st.contains("COMMITTRANSACTION") && underExplicitLock) {
+ txnCount++;
+ Assert.assertEquals(txnCount, 1);
+ } else if (st.contains("ENDOPERATION")) {
+ Assert.assertEquals(true, underExplicitLock);
+ underExplicitLock = false;
+ Assert.assertEquals(txnCount, 1);
+ txnCount = 0;
+ }
+ }
+ }
+ } catch (Exception e) {
+ throw new AssertionError(e);
+ } finally {
+ try {
+ fr.close();
+ reader.close();
+ } catch (Exception e) {
+ //
+ }
+ }
+
+ Assert.assertEquals(false, underExplicitLock);
+ Assert.assertEquals(txnCount, 0);
+ }
+
+}
\ No newline at end of file
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/pool/impl/StrictlyBoundedPool.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/pool/impl/StrictlyBoundedPool.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/pool/impl/StrictlyBoundedPool.java (revision 11330)
@@ -0,0 +1,52 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+
+package net.sf.ehcache.pool.impl;
+
+import net.sf.ehcache.pool.PoolAccessor;
+import net.sf.ehcache.pool.PoolEvictor;
+import net.sf.ehcache.pool.PoolParticipant;
+import net.sf.ehcache.pool.SizeOfEngine;
+
+/**
+ * A pool which strictly obeys to its bound: it will never allow the accessors to consume more bytes than what
+ * has been configured.
+ *
+ * @author Ludovic Orban
+ * @author Alex Snaps
+ */
+public class StrictlyBoundedPool extends AbstractPool {
+
+ /**
+ * Create a StrictlyBoundedPool instance
+ *
+ * @param maximumPoolSize the maximum size of the pool, in bytes.
+ * @param evictor the pool evictor, for cross-store eviction.
+ * @param defaultSizeOfEngine the default SizeOf engine used by the accessors.
+ */
+ public StrictlyBoundedPool(long maximumPoolSize, PoolEvictor evictor, SizeOfEngine defaultSizeOfEngine) {
+ super(maximumPoolSize, evictor, defaultSizeOfEngine);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public PoolAccessor createPoolAccessor(PoolParticipant participant, SizeOfEngine sizeOfEngine) {
+ LockedPoolAccessor accessor = new LockedPoolAccessor(this, participant, sizeOfEngine, 0);
+ registerPoolAccessor(accessor);
+ return accessor;
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/transaction/TransactionTimeoutException.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/transaction/TransactionTimeoutException.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/transaction/TransactionTimeoutException.java (revision 11330)
@@ -0,0 +1,32 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+package net.sf.ehcache.transaction;
+
+/**
+ * This exception is thrown when a transactional operation times out
+ *
+ * @author Ludovic Orban
+ */
+public class TransactionTimeoutException extends TransactionException {
+
+ /**
+ * Create a new TransactionTimeoutException
+ * @param message the error message
+ */
+ public TransactionTimeoutException(String message) {
+ super(message);
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/cluster/NoopCacheCluster.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/cluster/NoopCacheCluster.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/cluster/NoopCacheCluster.java (revision 11330)
@@ -0,0 +1,98 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+package net.sf.ehcache.cluster;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * This is a dummy implementation of the CacheCluster (Null Object Pattern). It ignores
+ * all listeners and reports no nodes.
+ *
+ * @author Geert Bevin
+ * @since 2.0
+ */
+public class NoopCacheCluster implements CacheCluster {
+
+ /**
+ * A singleton instance you can use rather than constructing your own.
+ */
+ public static final CacheCluster INSTANCE = new NoopCacheCluster();
+
+ /**
+ * {@inheritDoc}
+ */
+ public Collection getNodes() {
+ return Collections.emptyList();
+ }
+
+ /**
+ * Always returns the ClusterScheme.NONE
+ *
+ * @return {@link ClusterScheme#NONE}
+ */
+ public ClusterScheme getScheme() {
+ return ClusterScheme.NONE;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean addTopologyListener(ClusterTopologyListener listener) {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean removeTopologyListener(ClusterTopologyListener listener) {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isClusterOnline() {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ClusterNode getCurrentNode() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ClusterNode waitUntilNodeJoinsCluster() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public List getTopologyListeners() {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public void removeAllListeners() {
+ //
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/distribution/events/src/assemble/bin/start-jetty.bat
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/distribution/events/src/assemble/bin/start-jetty.bat (revision 0)
+++ rctags/ehcache-2.10.9.0.363/distribution/events/src/assemble/bin/start-jetty.bat (revision 11330)
@@ -0,0 +1,40 @@
+@echo off
+
+if not defined JAVA_HOME (
+ echo JAVA_HOME is not defined
+ exit /b 1
+)
+
+setlocal
+
+set jetty_instance=%1
+
+if "%jetty_instance%" == "" (
+ echo Need to specify which instance of Jetty: 9081 or 9082
+ exit /b 1
+)
+
+pushd "%~d0%~p0"
+for /f "tokens=*" %%a in ('call relative-paths.bat tc_install_dir') do set tc_install_dir=%%a
+pushd
+cd %tc_install_dir%
+set tc_install_dir=%CD%
+set tc_install_dir="%tc_install_dir:"=%"
+popd
+popd
+
+set JAVA_HOME="%JAVA_HOME:"=%"
+set root=%~d0%~p0..
+set root="%root:"=%"
+set jetty_work_dir=%root%\jetty6.1\%jetty_instance%
+set jetty_home=%tc_install_dir%\third-party\jetty-6.1.15
+set start_jar=%jetty_home%\start.jar
+set /a stop_port=jetty_instance + 2
+
+cd %jetty_work_dir%
+mkdir logs
+echo Starting Jetty %jetty_instance%...
+start "Jetty %jetty_instance%" %JAVA_HOME%\bin\java -Dtc.install-root=%tc_install_dir% -Xmx256m -XX:MaxPermSize=128m -Dconfig.home=%jetty_work_dir% -Djetty.home=%jetty_home% -DSTOP.PORT=%stop_port% -DSTOP.KEY=secret -jar %start_jar% conf.xml
+echo.
+
+endlocal
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/util/WeakIdentityConcurrentMapTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/util/WeakIdentityConcurrentMapTest.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/util/WeakIdentityConcurrentMapTest.java (revision 11330)
@@ -0,0 +1,62 @@
+package net.sf.ehcache.util;
+
+import org.hamcrest.core.Is;
+import org.junit.Test;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+/**
+ * @author Alex Snaps
+ */
+public class WeakIdentityConcurrentMapTest {
+
+ private Long someKey = 1024L;
+
+ @Test
+ public void testReturnsValueAndCleanUpsProperly() {
+
+ final ConcurrentMap cleanedUpValues = new ConcurrentHashMap();
+
+ final WeakIdentityConcurrentMap map = new WeakIdentityConcurrentMap(new WeakIdentityConcurrentMap.CleanUpTask() {
+ public void cleanUp(final String value) {
+ final AtomicLong previous = cleanedUpValues.putIfAbsent(value, new AtomicLong(1));
+ if(previous != null) {
+ previous.incrementAndGet();
+ }
+ }
+ });
+
+ final String value1 = "someValue for 1";
+ final String value2 = "someValue for 1024";
+ assertThat(map.putIfAbsent(1L, value1), nullValue());
+ assertThat(map.putIfAbsent(someKey, value2), nullValue());
+ assertThat(map.putIfAbsent(someKey, value2), equalTo(value2));
+ assertThat(map.get(1L), equalTo(value1));
+ assertThat(map.get(someKey), equalTo(value2));
+ someKey = null;
+
+ RetryAssert.assertBy(10, SECONDS, new Callable() {
+ public Integer call() throws Exception {
+ int i = 0;
+ while (i++ < 50) {
+ System.gc();
+ assertThat(map.get(someKey), nullValue());
+ }
+ return cleanedUpValues.size();
+ }
+ }, Is.is(1));
+
+ assertThat(cleanedUpValues.get(value2), notNullValue());
+ assertThat(cleanedUpValues.get(value2).get(), is(1L));
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/AsyncConfig.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/AsyncConfig.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/terracotta/bootstrap/src/main/java/org/terracotta/modules/ehcache/async/AsyncConfig.java (revision 11330)
@@ -0,0 +1,78 @@
+/*
+ * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
+ */
+package org.terracotta.modules.ehcache.async;
+
+import java.io.Serializable;
+
+public interface AsyncConfig extends Serializable {
+ /**
+ * Returns the minimum amount of time to wait between individual work cycles.
+ *
+ * This allows work to accumulate in the write behind queue and be processed more efficiently.
+ *
+ * @return the work delay that should be used, in milliseconds
+ */
+ public long getWorkDelay();
+
+ /**
+ * The maximum amount of time that a queue is allowed to fall behind on the work that it's processing.
+ *
+ * @return the maximum of time that the queue is allowed to fall behind, in milliseconds
+ */
+ public long getMaxAllowedFallBehind();
+
+ /**
+ * The number of items to include in each batch when batching is enabled. If there are less entries in the queue than
+ * the batch size, the queue length size is used.
+ *
+ * @return the amount of items to batch
+ */
+ public int getBatchSize();
+
+ /**
+ * Indicates whether to batch items. If set to {@code true}, {@link ItemProcessor#process(java.util.Collection)} will
+ * be called rather than {@link ItemProcessor#process(Serializable)} being called for individual item. Resources such as
+ * databases can perform more efficiently if updates are batched, thus reducing load.
+ *
+ * @return {@code true} if items should be batched; {@code false} otherwise
+ */
+ public boolean isBatchingEnabled();
+
+ /**
+ * Perform all writes to the Terracotta backend in a synchronous fashion, hence increasing reliability but decreasing
+ * performance.
+ *
+ * @return {@code true} to enable synchronous writes; or {@code false} to perform the write asynchronously
+ */
+ public boolean isSynchronousWrite();
+
+ /**
+ * Retrieves the number of times the processing of an item is retried.
+ *
+ * @return the number of tries before this pass is considered failed
+ */
+ public int getRetryAttempts();
+
+ /**
+ * Retrieves the number of milliseconds to wait before retrying a failed operation.
+ *
+ * @return the delay in between retries, in milliseconds
+ */
+ public long getRetryAttemptDelay();
+
+ /**
+ * Sets the maximum number of operations to allow per second when {@link #isBatchingEnabled} is enabled.
+ *
+ * @return the rate limit
+ */
+ public int getRateLimit();
+
+ /**
+ * The maximum size of items the Async coordinator can hold.
+ *
+ * @return
+ */
+ public int getMaxQueueSize();
+
+}
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/store/disk/SegmentTest.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/store/disk/SegmentTest.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/test/java/net/sf/ehcache/store/disk/SegmentTest.java (revision 11330)
@@ -0,0 +1,43 @@
+package net.sf.ehcache.store.disk;
+
+import net.sf.ehcache.CacheOperationOutcomes;
+import net.sf.ehcache.Ehcache;
+import net.sf.ehcache.Element;
+import net.sf.ehcache.config.CacheConfiguration;
+import net.sf.ehcache.event.CacheEventListener;
+import net.sf.ehcache.event.RegisteredEventListeners;
+import net.sf.ehcache.pool.PoolAccessor;
+
+import org.junit.Test;
+import org.terracotta.statistics.observer.OperationObserver;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * SegmentTest
+ */
+public class SegmentTest {
+
+ @Test
+ public void testInlineEvictionNotified() {
+ PoolAccessor onHeapAccessor = mock(PoolAccessor.class);
+ when(onHeapAccessor.add(eq("key"), any(DiskStorageFactory.DiskSubstitute.class), any(HashEntry.class), eq(false))).thenReturn(-1L);
+ RegisteredEventListeners cacheEventNotificationService = new RegisteredEventListeners(mock(Ehcache.class), null);
+ CacheEventListener listener = mock(CacheEventListener.class);
+ cacheEventNotificationService.registerListener(listener);
+
+ OperationObserver evictionObserver = mock(OperationObserver.class);
+ DiskStorageFactory diskStorageFactory = mock(DiskStorageFactory.class);
+
+ Segment segment = new Segment(10, .95f, diskStorageFactory, mock(CacheConfiguration.class), onHeapAccessor, mock(PoolAccessor.class), cacheEventNotificationService, evictionObserver);
+ Element element = new Element("key", "value");
+ when(diskStorageFactory.create(element)).thenReturn(new DiskStorageFactory.DiskMarker(diskStorageFactory, 0L, 0, element));
+ segment.put("key", 12, element, false, false);
+ verify(listener).notifyElementEvicted(any(Ehcache.class), eq(element));
+ verify(evictionObserver).end(CacheOperationOutcomes.EvictionOutcome.SUCCESS);
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/statistics/beans/AttributeProxy.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/statistics/beans/AttributeProxy.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/statistics/beans/AttributeProxy.java (revision 11330)
@@ -0,0 +1,116 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+
+package net.sf.ehcache.statistics.beans;
+
+/**
+ * The Class AttributeProxy, used to proxy operations from a dynamic mbean to a POJO object.
+ * Override get()/set() as needed.
+ *
+ * @param the return type/set type for the attribute
+ *
+ * @author cschanck
+ */
+public abstract class AttributeProxy {
+ private final String name;
+ private final Class clazz;
+ private final boolean isWrite;
+ private final boolean isRead;
+ private final String description;
+
+ /**
+ * Instantiates a new attribute proxy.
+ *
+ * @param clazz the clazz of the return type
+ * @param name the name
+ * @param description the description
+ * @param isRead readable
+ * @param isWrite writable
+ */
+ public AttributeProxy(Class clazz, String name, String description, boolean isRead, boolean isWrite) {
+ this.name = name;
+ this.description = description;
+ this.clazz = clazz;
+ this.isWrite = isWrite;
+ this.isRead = isRead;
+ }
+
+ /**
+ * Gets the description.
+ *
+ * @return the description
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * Gets the type class.
+ *
+ * @return the type class
+ */
+ public Class getTypeClass() {
+ return clazz;
+ }
+
+ /**
+ * Gets the name.
+ *
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Gets the value.
+ *
+ * @param name the name
+ * @return the value
+ */
+ public T get(String name) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Sets the value.
+ *
+ * @param name the name
+ * @param t the value
+ */
+ public void set(String name, T t) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Checks if is readable.
+ *
+ * @return true, if is read
+ */
+ public boolean isRead() {
+ return isRead;
+ }
+
+ /**
+ * Checks if is writable.
+ *
+ * @return true, if is writable
+ */
+ public boolean isWrite() {
+ return isWrite;
+ }
+
+}
Index: rctags/ehcache-2.10.9.0.363/ehcache/src/main/resources/META-INF/terracotta/public-api-types
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache/src/main/resources/META-INF/terracotta/public-api-types (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache/src/main/resources/META-INF/terracotta/public-api-types (revision 11330)
@@ -0,0 +1 @@
+# Don't remove this line -- if file is empty then everything will become an API type
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/hibernate/management/impl/BaseEmitterBean.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/hibernate/management/impl/BaseEmitterBean.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/hibernate/management/impl/BaseEmitterBean.java (revision 11330)
@@ -0,0 +1,168 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+
+package net.sf.ehcache.hibernate.management.impl;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicLong;
+
+import javax.management.ListenerNotFoundException;
+import javax.management.MBeanNotificationInfo;
+import javax.management.NotCompliantMBeanException;
+import javax.management.Notification;
+import javax.management.NotificationBroadcasterSupport;
+import javax.management.NotificationEmitter;
+import javax.management.NotificationFilter;
+import javax.management.NotificationListener;
+import javax.management.StandardMBean;
+
+/**
+ * @author gkeim
+ *
+ */
+public abstract class BaseEmitterBean extends StandardMBean implements NotificationEmitter {
+ /**
+ * emitter
+ */
+ protected final Emitter emitter = new Emitter();
+
+ /**
+ * sequenceNumber
+ */
+ protected final AtomicLong sequenceNumber = new AtomicLong();
+
+
+ private final List notificationListeners = new CopyOnWriteArrayList();
+
+ /**
+ * BaseEmitterBean
+ *
+ * @param
+ * @param mbeanInterface
+ * @throws NotCompliantMBeanException
+ */
+ protected BaseEmitterBean(Class mbeanInterface) throws NotCompliantMBeanException {
+ super(mbeanInterface);
+ }
+
+ /**
+ * sendNotification
+ *
+ * @param eventType
+ */
+ public void sendNotification(String eventType) {
+ sendNotification(eventType, null, null);
+ }
+
+ /**
+ * sendNotification
+ *
+ * @param eventType
+ * @param data
+ */
+ public void sendNotification(String eventType, Object data) {
+ sendNotification(eventType, data, null);
+ }
+
+ /**
+ * sendNotification
+ *
+ * @param eventType
+ * @param data
+ * @param msg
+ */
+ public void sendNotification(String eventType, Object data, String msg) {
+ Notification notif = new Notification(eventType, this, sequenceNumber.incrementAndGet(), System.currentTimeMillis(), msg);
+ if (data != null) {
+ notif.setUserData(data);
+ }
+ emitter.sendNotification(notif);
+ }
+
+ /**
+ * Dispose of this SampledCacheManager and clean up held resources
+ */
+ public final void dispose() {
+ doDispose();
+ removeAllNotificationListeners();
+ }
+
+ /**
+ * Dispose callback of subclasses
+ */
+ protected abstract void doDispose();
+
+ /**
+ * @author gkeim
+ */
+ private class Emitter extends NotificationBroadcasterSupport {
+ /**
+ * @see javax.management.NotificationBroadcasterSupport#getNotificationInfo()
+ */
+ @Override
+ public MBeanNotificationInfo[] getNotificationInfo() {
+ return BaseEmitterBean.this.getNotificationInfo();
+ }
+ }
+
+ /**
+ * @see javax.management.NotificationBroadcaster#addNotificationListener(javax.management.NotificationListener,
+ * javax.management.NotificationFilter, java.lang.Object)
+ */
+ public void addNotificationListener(NotificationListener notif, NotificationFilter filter, Object callBack) {
+ emitter.addNotificationListener(notif, filter, callBack);
+ notificationListeners.add(notif);
+ }
+
+ /**
+ * remove all added notification listeners
+ */
+ private void removeAllNotificationListeners() {
+ for (NotificationListener listener : notificationListeners) {
+ try {
+ emitter.removeNotificationListener(listener);
+ } catch (ListenerNotFoundException e) {
+ // ignore
+ }
+ }
+ notificationListeners.clear();
+ }
+
+ /**
+ * @see javax.management.NotificationBroadcaster#getNotificationInfo()
+ */
+ public abstract MBeanNotificationInfo[] getNotificationInfo();
+
+
+ /**
+ * @see javax.management.NotificationBroadcaster#removeNotificationListener(javax.management.NotificationListener)
+ */
+ public void removeNotificationListener(NotificationListener listener) throws ListenerNotFoundException {
+ emitter.removeNotificationListener(listener);
+ notificationListeners.remove(listener);
+ }
+
+ /**
+ * @see javax.management.NotificationEmitter#removeNotificationListener(javax.management.NotificationListener,
+ * javax.management.NotificationFilter, java.lang.Object)
+ */
+ public void removeNotificationListener(NotificationListener notif, NotificationFilter filter, Object callBack)
+ throws ListenerNotFoundException {
+ emitter.removeNotificationListener(notif, filter, callBack);
+ notificationListeners.remove(notif);
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/system-tests/src/test/resources/hibernate-config/nontransactional/domain/HolidayCalendar.hbm.xml
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/system-tests/src/test/resources/hibernate-config/nontransactional/domain/HolidayCalendar.hbm.xml (revision 0)
+++ rctags/ehcache-2.10.9.0.363/system-tests/src/test/resources/hibernate-config/nontransactional/domain/HolidayCalendar.hbm.xml (revision 11330)
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: rctags/ehcache-2.10.9.0.363/management-ehcache-v2/src/main/java/net/sf/ehcache/management/resource/CacheEntityV2.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/management-ehcache-v2/src/main/java/net/sf/ehcache/management/resource/CacheEntityV2.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/management-ehcache-v2/src/main/java/net/sf/ehcache/management/resource/CacheEntityV2.java (revision 11330)
@@ -0,0 +1,23 @@
+/* All content copyright (c) 2003-2012 Terracotta, Inc., except as may otherwise be noted in a separate copyright notice. All rights reserved.*/
+
+package net.sf.ehcache.management.resource;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ *
+ * An entity representing a cache resource from the management API.
+ *
+ *
+ * @author brandony
+ *
+ */
+public class CacheEntityV2 extends AbstractCacheEntityV2 {
+ private Map attributes = new HashMap();
+
+ public Map getAttributes() {
+ return attributes;
+ }
+}
Index: rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/store/chm/SelectableConcurrentHashMap.java
===================================================================
diff -u -N
--- rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/store/chm/SelectableConcurrentHashMap.java (revision 0)
+++ rctags/ehcache-2.10.9.0.363/ehcache-core/src/main/java/net/sf/ehcache/store/chm/SelectableConcurrentHashMap.java (revision 11330)
@@ -0,0 +1,1259 @@
+/**
+ * Copyright Terracotta, Inc.
+ *
+ * Licensed 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.
+ */
+package net.sf.ehcache.store.chm;
+
+import java.util.AbstractCollection;
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import net.sf.ehcache.CacheOperationOutcomes.EvictionOutcome;
+import net.sf.ehcache.Element;
+import net.sf.ehcache.event.RegisteredEventListeners;
+import net.sf.ehcache.pool.PoolAccessor;
+import org.terracotta.statistics.observer.OperationObserver;
+
+import static net.sf.ehcache.statistics.StatisticBuilder.operation;
+
+/**
+ * SelectableConcurrentHashMap subclasses a repackaged version of ConcurrentHashMap
+ * ito allow efficient random sampling of the map values.
+ *
+ * The random sampling technique involves randomly selecting a map Segment, and then
+ * selecting a number of random entry chains from that segment.
+ *
+ * @author Chris Dennis
+ */
+@SuppressWarnings("ForLoopReplaceableByForEach")
+public class SelectableConcurrentHashMap {
+
+ /**
+ * The default initial capacity for this table,
+ * used when not otherwise specified in a constructor.
+ */
+ static final int DEFAULT_INITIAL_CAPACITY = 16;
+
+ /**
+ * The default load factor for this table, used when not
+ * otherwise specified in a constructor.
+ */
+ static final float DEFAULT_LOAD_FACTOR = 0.75f;
+
+ /**
+ * The maximum capacity, used if a higher value is implicitly
+ * specified by either of the constructors with arguments. MUST
+ * be a power of two <= 1<<30 to ensure that entries are indexable
+ * using ints.
+ */
+ private static final int MAXIMUM_CAPACITY = 1 << 30;
+
+ /**
+ * The maximum number of segments to allow; used to bound
+ * constructor arguments.
+ */
+ private static final int MAX_SEGMENTS = 1 << 16; // slightly conservative
+
+ /**
+ * Number of unsynchronized retries in size and containsValue
+ * methods before resorting to locking. This is used to avoid
+ * unbounded retries if tables undergo continuous modification
+ * which would make it impossible to obtain an accurate result.
+ */
+ private static final int RETRIES_BEFORE_LOCK = 2;
+
+ /**
+ * Mask value for indexing into segments. The upper bits of a
+ * key's hash code are used to choose the segment.
+ */
+ private final int segmentMask;
+
+ /**
+ * Shift value for indexing within segments.
+ */
+ private final int segmentShift;
+
+ /**
+ * The segments, each of which is a specialized hash table
+ */
+ private final Segment[] segments;
+
+ private final Random rndm = new Random();
+ private final PoolAccessor poolAccessor;
+ private volatile long maxSize;
+ private final RegisteredEventListeners cacheEventNotificationService;
+
+ private Set