Hibernate SVN: r17657 - in core/trunk/cache-jbosscache/src: test/java/org/hibernate/test/cache/jbc/access and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: bstansberry(a)jboss.com
Date: 2009-10-08 13:50:07 -0400 (Thu, 08 Oct 2009)
New Revision: 17657
Modified:
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/PutFromLoadValidator.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/access/PutFromLoadValidatorUnitTestCase.java
Log:
[HHH-3817] Further refine, test PutFromLoadValidator
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/PutFromLoadValidator.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/PutFromLoadValidator.java 2009-10-08 13:29:47 UTC (rev 17656)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/PutFromLoadValidator.java 2009-10-08 17:50:07 UTC (rev 17657)
@@ -115,11 +115,14 @@
* may be <code>null</code>
*/
public PutFromLoadValidator(TransactionManager transactionManager) {
- this(transactionManager, NAKED_PUT_INVALIDATION_PERIOD, PENDING_PUT_OVERAGE_PERIOD, PENDING_PUT_RECENT_PERIOD, MAX_PENDING_PUT_DELAY);
+ this(transactionManager, NAKED_PUT_INVALIDATION_PERIOD, PENDING_PUT_OVERAGE_PERIOD,
+ PENDING_PUT_RECENT_PERIOD, MAX_PENDING_PUT_DELAY);
}
- /** Constructor variant for use by unit tests; allows control of variouts timeouts by the test. */
- protected PutFromLoadValidator(TransactionManager transactionManager, long nakedPutInvalidationPeriod, long pendingPutOveragePeriod, long pendingPutRecentPeriod, long maxPendingPutDelay) {
+ /** Constructor variant for use by unit tests; allows control of various timeouts by the test. */
+ protected PutFromLoadValidator(TransactionManager transactionManager,
+ long nakedPutInvalidationPeriod, long pendingPutOveragePeriod,
+ long pendingPutRecentPeriod, long maxPendingPutDelay) {
this.transactionManager = transactionManager;
this.nakedPutInvalidationPeriod = nakedPutInvalidationPeriod;
this.pendingPutOveragePeriod = pendingPutOveragePeriod;
@@ -127,6 +130,8 @@
this.maxPendingPutDelay = maxPendingPutDelay;
}
+ // ----------------------------------------------------------------- Public
+
public boolean isPutValid(Object key)
{
boolean valid = false;
@@ -264,6 +269,41 @@
// Guard against memory leaks
preventOutdatedPendingPuts(pendingPut);
}
+ // -------------------------------------------------------------- Protected
+
+ /** Only for use by unit tests; may be removed at any time */
+ protected int getPendingPutQueueLength() {
+ pendingLock.lock();
+ try {
+ return pendingQueue.size();
+ }
+ finally {
+ pendingLock.unlock();
+ }
+ }
+
+ /** Only for use by unit tests; may be removed at any time */
+ protected int getOveragePendingPutQueueLength() {
+ pendingLock.lock();
+ try {
+ return overagePendingQueue.size();
+ }
+ finally {
+ pendingLock.unlock();
+ }
+ }
+
+ /** Only for use by unit tests; may be removed at any time */
+ protected int getRemovalQueueLength() {
+ removalsLock.lock();
+ try {
+ return removalsQueue.size();
+ }
+ finally {
+ removalsLock.unlock();
+ }
+ }
+ // ---------------------------------------------------------------- Private
private Object getOwnerForPut()
{
@@ -307,7 +347,7 @@
int pos = 0;
while (pendingQueue.size() > pos) {
- WeakReference<PendingPut> ref = pendingQueue.get(0);
+ WeakReference<PendingPut> ref = pendingQueue.get(pos);
PendingPut item = ref.get();
if (item == null || item.completed) {
pendingQueue.remove(pos);
@@ -343,6 +383,7 @@
}
else {
if (item.timestamp < mustCleanTime) {
+ overagePendingQueue.remove(0);
toClean = item;
}
break;
@@ -357,7 +398,7 @@
// We've found a pendingPut that never happened; clean it up
if (toClean != null) {
- PendingPutMap map = pendingPuts.get(toClean.key);
+ PendingPutMap map = pendingPuts.get(toClean.key);
if (map != null) {
synchronized (map) {
PendingPut cleaned = map.remove(toClean.owner);
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/access/PutFromLoadValidatorUnitTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/access/PutFromLoadValidatorUnitTestCase.java 2009-10-08 13:29:47 UTC (rev 17656)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/access/PutFromLoadValidatorUnitTestCase.java 2009-10-08 17:50:07 UTC (rev 17657)
@@ -23,224 +23,406 @@
*/
package org.hibernate.test.cache.jbc.access;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
+import junit.framework.TestCase;
+
import org.hibernate.cache.jbc.access.PutFromLoadValidator;
import org.hibernate.test.cache.jbc.functional.util.DualNodeJtaTransactionManagerImpl;
-import junit.framework.TestCase;
-
/**
* Tests of {@link PutFromLoadValidator}.
- *
+ *
* @author Brian Stansberry
*
* @version $Revision: $
*/
-public class PutFromLoadValidatorUnitTestCase extends TestCase
-{
- private Object KEY1= "KEY1";
-
- private TransactionManager tm;
-
- public PutFromLoadValidatorUnitTestCase(String name) {
- super(name);
- }
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
- tm = DualNodeJtaTransactionManagerImpl.getInstance("test");
- }
+public class PutFromLoadValidatorUnitTestCase extends TestCase {
+ private Object KEY1 = "KEY1";
- @Override
- protected void tearDown() throws Exception
- {
- try {
- super.tearDown();
- }
- finally {
- tm = null;
- try {
- DualNodeJtaTransactionManagerImpl.cleanupTransactions();
- }
- finally {
- DualNodeJtaTransactionManagerImpl.cleanupTransactionManagers();
- }
- }
- }
+ private TransactionManager tm;
- public void testNakedPut() throws Exception {
- nakedPutTest(false);
- }
+ public PutFromLoadValidatorUnitTestCase(String name) {
+ super(name);
+ }
- public void testNakedPutTransactional() throws Exception {
- nakedPutTest(true);
- }
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ tm = DualNodeJtaTransactionManagerImpl.getInstance("test");
+ }
- private void nakedPutTest(boolean transactional) throws Exception {
- PutFromLoadValidator testee = new PutFromLoadValidator(transactional ? tm : null);
- if (transactional) {
- tm.begin();
- }
- assertTrue(testee.isPutValid(KEY1));
- }
+ @Override
+ protected void tearDown() throws Exception {
+ try {
+ super.tearDown();
+ } finally {
+ tm = null;
+ try {
+ DualNodeJtaTransactionManagerImpl.cleanupTransactions();
+ } finally {
+ DualNodeJtaTransactionManagerImpl.cleanupTransactionManagers();
+ }
+ }
+ }
- public void testRegisteredPut() throws Exception {
- registeredPutTest(false);
- }
+ public void testNakedPut() throws Exception {
+ nakedPutTest(false);
+ }
- public void testRegisteredPutTransactional() throws Exception {
- registeredPutTest(true);
- }
+ public void testNakedPutTransactional() throws Exception {
+ nakedPutTest(true);
+ }
- private void registeredPutTest(boolean transactional) throws Exception {
- PutFromLoadValidator testee = new PutFromLoadValidator(transactional ? tm : null);
- if (transactional) {
- tm.begin();
- }
- testee.registerPendingPut(KEY1);
- assertTrue(testee.isPutValid(KEY1));
- }
-
- public void testNakedPutAfterKeyRemoval() throws Exception {
- nakedPutAfterRemovalTest(false, false);
- }
-
- public void testNakedPutAfterKeyRemovalTransactional() throws Exception {
- nakedPutAfterRemovalTest(true, false);
- }
-
- public void testNakedPutAfterRegionRemoval() throws Exception {
- nakedPutAfterRemovalTest(false, true);
- }
-
- public void testNakedPutAfterRegionRemovalTransactional() throws Exception {
- nakedPutAfterRemovalTest(true, true);
- }
+ private void nakedPutTest(boolean transactional) throws Exception {
+ PutFromLoadValidator testee = new PutFromLoadValidator(
+ transactional ? tm : null);
+ if (transactional) {
+ tm.begin();
+ }
+ assertTrue(testee.isPutValid(KEY1));
+ }
- private void nakedPutAfterRemovalTest(boolean transactional, boolean removeRegion) throws Exception
- {
- PutFromLoadValidator testee = new PutFromLoadValidator(transactional ? tm : null);
- if (removeRegion) {
- testee.regionRemoved();
- }
- else {
- testee.keyRemoved(KEY1);
- }
- if (transactional) {
- tm.begin();
- }
- assertFalse(testee.isPutValid(KEY1));
-
- }
-
- public void testRegisteredPutAfterKeyRemoval() throws Exception {
- registeredPutAfterRemovalTest(false, false);
- }
-
- public void testRegisteredPutAfterKeyRemovalTransactional() throws Exception {
- registeredPutAfterRemovalTest(true, false);
- }
-
- public void testRegisteredPutAfterRegionRemoval() throws Exception {
- registeredPutAfterRemovalTest(false, true);
- }
-
- public void testRegisteredPutAfterRegionRemovalTransactional() throws Exception {
- registeredPutAfterRemovalTest(true, true);
- }
+ public void testRegisteredPut() throws Exception {
+ registeredPutTest(false);
+ }
- private void registeredPutAfterRemovalTest(boolean transactional, boolean removeRegion) throws Exception
- {
- PutFromLoadValidator testee = new PutFromLoadValidator(transactional ? tm : null);
- if (removeRegion) {
- testee.regionRemoved();
- }
- else {
- testee.keyRemoved(KEY1);
- }
- if (transactional) {
- tm.begin();
- }
- testee.registerPendingPut(KEY1);
- assertTrue(testee.isPutValid(KEY1));
- }
-
- public void testRegisteredPutWithInterveningKeyRemoval() throws Exception {
- registeredPutWithInterveningRemovalTest(false, false);
- }
-
- public void testRegisteredPutWithInterveningKeyRemovalTransactional() throws Exception {
- registeredPutWithInterveningRemovalTest(true, false);
- }
-
- public void testRegisteredPutWithInterveningRegionRemoval() throws Exception {
- registeredPutWithInterveningRemovalTest(false, true);
- }
-
- public void testRegisteredPutWithInterveningRegionRemovalTransactional() throws Exception {
- registeredPutWithInterveningRemovalTest(true, true);
- }
+ public void testRegisteredPutTransactional() throws Exception {
+ registeredPutTest(true);
+ }
- private void registeredPutWithInterveningRemovalTest(boolean transactional, boolean removeRegion) throws Exception
- {
- PutFromLoadValidator testee = new PutFromLoadValidator(transactional ? tm : null);
- if (transactional) {
- tm.begin();
- }
- testee.registerPendingPut(KEY1);
- if (removeRegion) {
- testee.regionRemoved();
- }
- else {
- testee.keyRemoved(KEY1);
- }
- assertFalse(testee.isPutValid(KEY1));
- }
-
- public void testDelayedNakedPutAfterKeyRemoval() throws Exception {
- delayedNakedPutAfterRemovalTest(false, false);
- }
-
- public void testDelayedNakedPutAfterKeyRemovalTransactional() throws Exception {
- delayedNakedPutAfterRemovalTest(true, false);
- }
-
- public void testDelayedNakedPutAfterRegionRemoval() throws Exception {
- delayedNakedPutAfterRemovalTest(false, true);
- }
-
- public void testDelayedNakedPutAfterRegionRemovalTransactional() throws Exception {
- delayedNakedPutAfterRemovalTest(true, true);
- }
+ private void registeredPutTest(boolean transactional) throws Exception {
+ PutFromLoadValidator testee = new PutFromLoadValidator(
+ transactional ? tm : null);
+ if (transactional) {
+ tm.begin();
+ }
+ testee.registerPendingPut(KEY1);
+ assertTrue(testee.isPutValid(KEY1));
+ }
- private void delayedNakedPutAfterRemovalTest(boolean transactional, boolean removeRegion) throws Exception
- {
- PutFromLoadValidator testee = new TestValidator(transactional ? tm : null, 100, 1000, 500, 10000);
- if (removeRegion) {
- testee.regionRemoved();
- }
- else {
- testee.keyRemoved(KEY1);
- }
- if (transactional) {
- tm.begin();
- }
- Thread.sleep(110);
- assertTrue(testee.isPutValid(KEY1));
-
- }
-
- private static class TestValidator extends PutFromLoadValidator {
+ public void testNakedPutAfterKeyRemoval() throws Exception {
+ nakedPutAfterRemovalTest(false, false);
+ }
- protected TestValidator(TransactionManager transactionManager, long nakedPutInvalidationPeriod,
- long pendingPutOveragePeriod, long pendingPutRecentPeriod, long maxPendingPutDelay)
- {
- super(transactionManager, nakedPutInvalidationPeriod, pendingPutOveragePeriod, pendingPutRecentPeriod,
- maxPendingPutDelay);
- }
-
- }
+ public void testNakedPutAfterKeyRemovalTransactional() throws Exception {
+ nakedPutAfterRemovalTest(true, false);
+ }
+
+ public void testNakedPutAfterRegionRemoval() throws Exception {
+ nakedPutAfterRemovalTest(false, true);
+ }
+
+ public void testNakedPutAfterRegionRemovalTransactional() throws Exception {
+ nakedPutAfterRemovalTest(true, true);
+ }
+
+ private void nakedPutAfterRemovalTest(boolean transactional,
+ boolean removeRegion) throws Exception {
+ PutFromLoadValidator testee = new PutFromLoadValidator(
+ transactional ? tm : null);
+ if (removeRegion) {
+ testee.regionRemoved();
+ } else {
+ testee.keyRemoved(KEY1);
+ }
+ if (transactional) {
+ tm.begin();
+ }
+ assertFalse(testee.isPutValid(KEY1));
+
+ }
+
+ public void testRegisteredPutAfterKeyRemoval() throws Exception {
+ registeredPutAfterRemovalTest(false, false);
+ }
+
+ public void testRegisteredPutAfterKeyRemovalTransactional()
+ throws Exception {
+ registeredPutAfterRemovalTest(true, false);
+ }
+
+ public void testRegisteredPutAfterRegionRemoval() throws Exception {
+ registeredPutAfterRemovalTest(false, true);
+ }
+
+ public void testRegisteredPutAfterRegionRemovalTransactional()
+ throws Exception {
+ registeredPutAfterRemovalTest(true, true);
+ }
+
+ private void registeredPutAfterRemovalTest(boolean transactional,
+ boolean removeRegion) throws Exception {
+ PutFromLoadValidator testee = new PutFromLoadValidator(
+ transactional ? tm : null);
+ if (removeRegion) {
+ testee.regionRemoved();
+ } else {
+ testee.keyRemoved(KEY1);
+ }
+ if (transactional) {
+ tm.begin();
+ }
+ testee.registerPendingPut(KEY1);
+ assertTrue(testee.isPutValid(KEY1));
+ }
+
+ public void testRegisteredPutWithInterveningKeyRemoval() throws Exception {
+ registeredPutWithInterveningRemovalTest(false, false);
+ }
+
+ public void testRegisteredPutWithInterveningKeyRemovalTransactional()
+ throws Exception {
+ registeredPutWithInterveningRemovalTest(true, false);
+ }
+
+ public void testRegisteredPutWithInterveningRegionRemoval()
+ throws Exception {
+ registeredPutWithInterveningRemovalTest(false, true);
+ }
+
+ public void testRegisteredPutWithInterveningRegionRemovalTransactional()
+ throws Exception {
+ registeredPutWithInterveningRemovalTest(true, true);
+ }
+
+ private void registeredPutWithInterveningRemovalTest(boolean transactional,
+ boolean removeRegion) throws Exception {
+ PutFromLoadValidator testee = new PutFromLoadValidator(
+ transactional ? tm : null);
+ if (transactional) {
+ tm.begin();
+ }
+ testee.registerPendingPut(KEY1);
+ if (removeRegion) {
+ testee.regionRemoved();
+ } else {
+ testee.keyRemoved(KEY1);
+ }
+ assertFalse(testee.isPutValid(KEY1));
+ }
+
+ public void testDelayedNakedPutAfterKeyRemoval() throws Exception {
+ delayedNakedPutAfterRemovalTest(false, false);
+ }
+
+ public void testDelayedNakedPutAfterKeyRemovalTransactional()
+ throws Exception {
+ delayedNakedPutAfterRemovalTest(true, false);
+ }
+
+ public void testDelayedNakedPutAfterRegionRemoval() throws Exception {
+ delayedNakedPutAfterRemovalTest(false, true);
+ }
+
+ public void testDelayedNakedPutAfterRegionRemovalTransactional()
+ throws Exception {
+ delayedNakedPutAfterRemovalTest(true, true);
+ }
+
+ private void delayedNakedPutAfterRemovalTest(boolean transactional,
+ boolean removeRegion) throws Exception {
+ PutFromLoadValidator testee = new TestValidator(transactional ? tm
+ : null, 100, 1000, 500, 10000);
+ if (removeRegion) {
+ testee.regionRemoved();
+ } else {
+ testee.keyRemoved(KEY1);
+ }
+ if (transactional) {
+ tm.begin();
+ }
+ Thread.sleep(110);
+ assertTrue(testee.isPutValid(KEY1));
+
+ }
+
+ public void testMultipleRegistrations() throws Exception {
+ multipleRegistrationtest(false);
+ }
+
+ public void testMultipleRegistrationsTransactional() throws Exception {
+ multipleRegistrationtest(true);
+ }
+
+ private void multipleRegistrationtest(final boolean transactional) throws Exception {
+ final PutFromLoadValidator testee = new PutFromLoadValidator(transactional ? tm : null);
+
+ final CountDownLatch registeredLatch = new CountDownLatch(3);
+ final CountDownLatch finishedLatch = new CountDownLatch(3);
+ final AtomicInteger success = new AtomicInteger();
+
+ Runnable r = new Runnable() {
+ public void run() {
+ try {
+ if (transactional) {
+ tm.begin();
+ }
+ testee.registerPendingPut(KEY1);
+ registeredLatch.countDown();
+ registeredLatch.await(5, TimeUnit.SECONDS);
+ if (testee.isPutValid(KEY1)) {
+ success.incrementAndGet();
+ }
+ finishedLatch.countDown();
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ };
+
+ ExecutorService executor = Executors.newFixedThreadPool(3);
+
+ // Start with a removal so the "isPutValid" calls will fail if
+ // any of the concurrent activity isn't handled properly
+
+ testee.regionRemoved();
+
+ // Do the registration + isPutValid calls
+ executor.execute(r);
+ executor.execute(r);
+ executor.execute(r);
+
+ finishedLatch.await(5, TimeUnit.SECONDS);
+
+ assertEquals("All threads succeeded", 3, success.get());
+ }
+
+ /**
+ * White box test for ensuring key removals get cleaned up.
+ *
+ * @throws Exception
+ */
+ public void testRemovalCleanup() throws Exception {
+ TestValidator testee = new TestValidator(null, 200, 1000, 500, 10000);
+ testee.keyRemoved("KEY1");
+ testee.keyRemoved("KEY2");
+ Thread.sleep(210);
+ assertEquals(2, testee.getRemovalQueueLength());
+ testee.keyRemoved("KEY1");
+ assertEquals(2, testee.getRemovalQueueLength());
+ testee.keyRemoved("KEY2");
+ assertEquals(2, testee.getRemovalQueueLength());
+ }
+
+ /**
+ * Very much a white box test of the logic for ensuring pending
+ * put registrations get cleaned up.
+ *
+ * @throws Exception
+ */
+ public void testPendingPutCleanup() throws Exception {
+ TestValidator testee = new TestValidator(tm, 5000, 600, 300, 900);
+
+ // Start with a regionRemoval so we can confirm at the end that all
+ // registrations have been cleaned out
+ testee.regionRemoved();
+
+ testee.registerPendingPut("1");
+ testee.registerPendingPut("2");
+ testee.registerPendingPut("3");
+ testee.registerPendingPut("4");
+ testee.registerPendingPut("5");
+ testee.registerPendingPut("6");
+ testee.isPutValid("6");
+ testee.isPutValid("2");
+ // ppq = [1,2(c),3,4,5,6(c)]
+ assertEquals(6, testee.getPendingPutQueueLength());
+ assertEquals(0, testee.getOveragePendingPutQueueLength());
+
+ // Sleep past "pendingPutRecentPeriod"
+ Thread.sleep(310);
+ testee.registerPendingPut("7");
+ // White box -- should have cleaned out 2 (completed) but
+ // not gotten to 6 (also removed)
+ // ppq = [1,3,4,5,6(c),7]
+ assertEquals(0, testee.getOveragePendingPutQueueLength());
+ assertEquals(6, testee.getPendingPutQueueLength());
+
+ // Sleep past "pendingPutOveragePeriod"
+ Thread.sleep(310);
+ testee.registerPendingPut("8");
+ // White box -- should have cleaned out 6 (completed) and
+ // moved 1, 3, 4 and 5 to overage queue
+ // oppq = [1,3,4,5] ppq = [7,8]
+ assertEquals(4, testee.getOveragePendingPutQueueLength());
+ assertEquals(2, testee.getPendingPutQueueLength());
+
+ // Sleep past "maxPendingPutDelay"
+ Thread.sleep(310);
+ testee.isPutValid("3");
+ // White box -- should have cleaned out 1 (overage) and
+ // moved 7 to overage queue
+ // oppq = [3(c),4,5,7] ppq=[8]
+ assertEquals(4, testee.getOveragePendingPutQueueLength());
+ assertEquals(1, testee.getPendingPutQueueLength());
+
+ // Sleep past "maxPendingPutDelay"
+ Thread.sleep(310);
+ tm.begin();
+ testee.registerPendingPut("7");
+ Transaction tx = tm.suspend();
+
+ // White box -- should have cleaned out 3 (completed)
+ // and 4 (overage) and moved 8 to overage queue
+ // We now have 5,7,8 in overage and 7tx in pending
+ // oppq = [5,7,8] ppq=[7tx]
+ assertEquals(3, testee.getOveragePendingPutQueueLength());
+ assertEquals(1, testee.getPendingPutQueueLength());
+
+ // Validate that only expected items can do puts, thus indirectly
+ // proving the others have been cleaned out of pendingPuts map
+ assertFalse(testee.isPutValid("1"));
+ // 5 was overage, so should have been cleaned
+ assertEquals(2, testee.getOveragePendingPutQueueLength());
+ assertFalse(testee.isPutValid("2"));
+ // 7 was overage, so should have been cleaned
+ assertEquals(1, testee.getOveragePendingPutQueueLength());
+ assertFalse(testee.isPutValid("3"));
+ assertFalse(testee.isPutValid("4"));
+ assertFalse(testee.isPutValid("5"));
+ assertFalse(testee.isPutValid("6"));
+ assertFalse(testee.isPutValid("7"));
+ assertTrue(testee.isPutValid("8"));
+ tm.resume(tx);
+ assertTrue(testee.isPutValid("7"));
+ }
+
+ private static class TestValidator extends PutFromLoadValidator {
+
+ protected TestValidator(TransactionManager transactionManager,
+ long nakedPutInvalidationPeriod, long pendingPutOveragePeriod,
+ long pendingPutRecentPeriod, long maxPendingPutDelay) {
+ super(transactionManager, nakedPutInvalidationPeriod,
+ pendingPutOveragePeriod, pendingPutRecentPeriod,
+ maxPendingPutDelay);
+ }
+
+ @Override
+ public int getOveragePendingPutQueueLength() {
+ // TODO Auto-generated method stub
+ return super.getOveragePendingPutQueueLength();
+ }
+
+ @Override
+ public int getPendingPutQueueLength() {
+ // TODO Auto-generated method stub
+ return super.getPendingPutQueueLength();
+ }
+
+ @Override
+ public int getRemovalQueueLength() {
+ // TODO Auto-generated method stub
+ return super.getRemovalQueueLength();
+ }
+
+ }
}
14 years, 9 months
Hibernate SVN: r17656 - in validator/trunk: hibernate-validator and 3 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-10-08 09:29:47 -0400 (Thu, 08 Oct 2009)
New Revision: 17656
Modified:
validator/trunk/hibernate-validator-archetype/pom.xml
validator/trunk/hibernate-validator-legacy/pom.xml
validator/trunk/hibernate-validator-tck-runner/pom.xml
validator/trunk/hibernate-validator/pom.xml
validator/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: validator/trunk/hibernate-validator/pom.xml
===================================================================
--- validator/trunk/hibernate-validator/pom.xml 2009-10-08 13:28:37 UTC (rev 17655)
+++ validator/trunk/hibernate-validator/pom.xml 2009-10-08 13:29:47 UTC (rev 17656)
@@ -2,7 +2,7 @@
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.0.0.GA</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: validator/trunk/hibernate-validator-archetype/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-archetype/pom.xml 2009-10-08 13:28:37 UTC (rev 17655)
+++ validator/trunk/hibernate-validator-archetype/pom.xml 2009-10-08 13:29:47 UTC (rev 17656)
@@ -4,7 +4,7 @@
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.0.0.GA</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.hibernate</groupId>
Modified: validator/trunk/hibernate-validator-legacy/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-legacy/pom.xml 2009-10-08 13:28:37 UTC (rev 17655)
+++ validator/trunk/hibernate-validator-legacy/pom.xml 2009-10-08 13:29:47 UTC (rev 17656)
@@ -4,13 +4,13 @@
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.0.0.GA</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hibernate-validator-legacy</artifactId>
<packaging>jar</packaging>
<name>Hibernate Validator Legacy</name>
- <version>4.0.0.GA</version>
+ <version>3.1.0.GA</version>
<url>http://validator.hibernate.org</url>
<licenses>
<license>
Modified: validator/trunk/hibernate-validator-tck-runner/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-tck-runner/pom.xml 2009-10-08 13:28:37 UTC (rev 17655)
+++ validator/trunk/hibernate-validator-tck-runner/pom.xml 2009-10-08 13:29:47 UTC (rev 17656)
@@ -2,7 +2,7 @@
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.0.0.GA</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hibernate-validator-tck-runner</artifactId>
Modified: validator/trunk/pom.xml
===================================================================
--- validator/trunk/pom.xml 2009-10-08 13:28:37 UTC (rev 17655)
+++ validator/trunk/pom.xml 2009-10-08 13:29:47 UTC (rev 17656)
@@ -3,7 +3,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator-parent</artifactId>
<packaging>pom</packaging>
- <version>4.0.0.GA</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>Hibernate Validator Parent</name>
<url>http://validator.hibernate.org</url>
@@ -170,8 +170,8 @@
</licenses>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/hibernate/validator/tags/v4_0_0_GA</connection>
- <url>http://fisheye.jboss.org/browse/Hibernate/validator/tags/v4_0_0_GA</url>
+ <connection>scm:svn:https://svn.jboss.org/repos/hibernate/validator/trunk</connection>
+ <url>http://fisheye.jboss.org/browse/Hibernate/validator/trunk</url>
</scm>
<distributionManagement>
14 years, 9 months
Hibernate SVN: r17655 - validator/tags.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-10-08 09:28:37 -0400 (Thu, 08 Oct 2009)
New Revision: 17655
Added:
validator/tags/v4_0_0_GA/
Log:
[maven-scm] copy for tag v4_0_0_GA
Copied: validator/tags/v4_0_0_GA (from rev 17654, validator/trunk)
14 years, 9 months
Hibernate SVN: r17654 - in validator/trunk: hibernate-validator and 3 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-10-08 09:26:48 -0400 (Thu, 08 Oct 2009)
New Revision: 17654
Modified:
validator/trunk/hibernate-validator-archetype/pom.xml
validator/trunk/hibernate-validator-legacy/pom.xml
validator/trunk/hibernate-validator-tck-runner/pom.xml
validator/trunk/hibernate-validator/pom.xml
validator/trunk/pom.xml
Log:
[maven-release-plugin] prepare release v4_0_0_GA
Modified: validator/trunk/hibernate-validator/pom.xml
===================================================================
--- validator/trunk/hibernate-validator/pom.xml 2009-10-08 13:19:12 UTC (rev 17653)
+++ validator/trunk/hibernate-validator/pom.xml 2009-10-08 13:26:48 UTC (rev 17654)
@@ -1,10 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.0.0.CR2-SNAPSHOT</version>
+ <version>4.0.0.GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -156,7 +154,7 @@
</relocation>
</relocations>
<transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"/>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
</transformers>
</configuration>
</execution>
Modified: validator/trunk/hibernate-validator-archetype/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-archetype/pom.xml 2009-10-08 13:19:12 UTC (rev 17653)
+++ validator/trunk/hibernate-validator-archetype/pom.xml 2009-10-08 13:26:48 UTC (rev 17654)
@@ -4,7 +4,7 @@
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.0.0.CR2-SNAPSHOT</version>
+ <version>4.0.0.GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.hibernate</groupId>
Modified: validator/trunk/hibernate-validator-legacy/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-legacy/pom.xml 2009-10-08 13:19:12 UTC (rev 17653)
+++ validator/trunk/hibernate-validator-legacy/pom.xml 2009-10-08 13:26:48 UTC (rev 17654)
@@ -4,13 +4,13 @@
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.0.0.CR2-SNAPSHOT</version>
+ <version>4.0.0.GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hibernate-validator-legacy</artifactId>
<packaging>jar</packaging>
<name>Hibernate Validator Legacy</name>
- <version>3.1.0.GA</version>
+ <version>4.0.0.GA</version>
<url>http://validator.hibernate.org</url>
<licenses>
<license>
Modified: validator/trunk/hibernate-validator-tck-runner/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-tck-runner/pom.xml 2009-10-08 13:19:12 UTC (rev 17653)
+++ validator/trunk/hibernate-validator-tck-runner/pom.xml 2009-10-08 13:26:48 UTC (rev 17654)
@@ -2,7 +2,7 @@
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.0.0.CR2-SNAPSHOT</version>
+ <version>4.0.0.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hibernate-validator-tck-runner</artifactId>
Modified: validator/trunk/pom.xml
===================================================================
--- validator/trunk/pom.xml 2009-10-08 13:19:12 UTC (rev 17653)
+++ validator/trunk/pom.xml 2009-10-08 13:26:48 UTC (rev 17654)
@@ -3,7 +3,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator-parent</artifactId>
<packaging>pom</packaging>
- <version>4.0.0.CR2-SNAPSHOT</version>
+ <version>4.0.0.GA</version>
<name>Hibernate Validator Parent</name>
<url>http://validator.hibernate.org</url>
@@ -170,8 +170,8 @@
</licenses>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/hibernate/validator/trunk</connection>
- <url>http://fisheye.jboss.org/browse/Hibernate/validator/trunk</url>
+ <connection>scm:svn:https://svn.jboss.org/repos/hibernate/validator/tags/v4_0_0_GA</connection>
+ <url>http://fisheye.jboss.org/browse/Hibernate/validator/tags/v4_0_0_GA</url>
</scm>
<distributionManagement>
14 years, 9 months
Hibernate SVN: r17653 - in validator/trunk: hibernate-validator and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-10-08 09:19:12 -0400 (Thu, 08 Oct 2009)
New Revision: 17653
Modified:
validator/trunk/hibernate-validator-tck-runner/pom.xml
validator/trunk/hibernate-validator/readme.txt
validator/trunk/hibernate-validator/src/main/docbook/en-US/master.xml
validator/trunk/pom.xml
Log:
Updated version numbers and readme for the 1.0.0.GA release
Modified: validator/trunk/hibernate-validator/readme.txt
===================================================================
--- validator/trunk/hibernate-validator/readme.txt 2009-10-08 09:06:00 UTC (rev 17652)
+++ validator/trunk/hibernate-validator/readme.txt 2009-10-08 13:19:12 UTC (rev 17653)
@@ -19,23 +19,19 @@
Status
------
- This is the first CR release of Hibernate Validator.
+ This is the first GA release of Hibernate Validator 4.
- You can find more information about the current state of the implementation on the
- Bean Validation RI Roadmap - http://www.hibernate.org/459.html and there is copy of
- JSR 303 available here: http://in.relation.to/service/File/12014
-
Documentation
-------------
- The documentation available as of the date of this release is included in
- HTML and PDf format in the docs directory.
+ The documentation for this release is included in the docs directory of distribution package
+ or online under https://www.hibernate.org/5.html
Release Notes
-------------
- The full list of changes can be found at
- http://opensource.atlassian.com/projects/hibernate/secure/ConfigureReleas....
+ The full list of changes can be found at
+ http://opensource.atlassian.com/projects/hibernate/secure/ReleaseNote.jsp...
System Requirements
-------------------
Modified: validator/trunk/hibernate-validator/src/main/docbook/en-US/master.xml
===================================================================
--- validator/trunk/hibernate-validator/src/main/docbook/en-US/master.xml 2009-10-08 09:06:00 UTC (rev 17652)
+++ validator/trunk/hibernate-validator/src/main/docbook/en-US/master.xml 2009-10-08 13:19:12 UTC (rev 17653)
@@ -25,7 +25,7 @@
-->
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY versionNumber "4.0.0.CR1">
+<!ENTITY versionNumber "4.0.0.GA">
<!ENTITY copyrightYear "2009">
<!ENTITY copyrightHolder "Red Hat Middleware, LLC. & Gunnar Morling">
]>
Modified: validator/trunk/hibernate-validator-tck-runner/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-tck-runner/pom.xml 2009-10-08 09:06:00 UTC (rev 17652)
+++ validator/trunk/hibernate-validator-tck-runner/pom.xml 2009-10-08 13:19:12 UTC (rev 17653)
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.hibernate.jsr303.tck</groupId>
<artifactId>jsr303-tck</artifactId>
- <version>1.0.0.Beta1-SNAPSHOT</version>
+ <version>1.0.0.GA</version>
</dependency>
<dependency>
<groupId>org.jboss.test-harness</groupId>
Modified: validator/trunk/pom.xml
===================================================================
--- validator/trunk/pom.xml 2009-10-08 09:06:00 UTC (rev 17652)
+++ validator/trunk/pom.xml 2009-10-08 13:19:12 UTC (rev 17653)
@@ -47,7 +47,7 @@
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
- <version>1.0.0.GA-SNAPSHOT</version>
+ <version>1.0.0.GA</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
14 years, 9 months
Hibernate SVN: r17651 - beanvalidation/tck/tags.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-10-08 05:05:41 -0400 (Thu, 08 Oct 2009)
New Revision: 17651
Added:
beanvalidation/tck/tags/v1_0_0_GA/
Log:
[maven-scm] copy for tag v1_0_0_GA
Copied: beanvalidation/tck/tags/v1_0_0_GA (from rev 17650, beanvalidation/tck/trunk)
14 years, 9 months