JBoss Cache SVN: r7328 - searchable/tags/1.0.0.CR99.
by jbosscache-commits＠lists.jboss.org
Author: navssurtani
Date: 2008-12-13 10:22:13 -0500 (Sat, 13 Dec 2008)
New Revision: 7328
Added:
searchable/tags/1.0.0.CR99/trunk/
Log:
JBoss Cache Searchable Release Script: Tagging 1.0.0.CR99
Copied: searchable/tags/1.0.0.CR99/trunk (from rev 7327, searchable/trunk)
16 years, 3 months
JBoss Cache SVN: r7327 - in searchable/tags/1.0.0.CR99: src/main/java/org/jboss/cache and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: navssurtani
Date: 2008-12-13 10:17:12 -0500 (Sat, 13 Dec 2008)
New Revision: 7327
Modified:
searchable/tags/1.0.0.CR99/pom.xml
searchable/tags/1.0.0.CR99/src/main/java/org/jboss/cache/Version.java
Log:
JBoss Cache Release Script: Updating 1.0.0.CR99
Modified: searchable/tags/1.0.0.CR99/pom.xml
===================================================================
--- searchable/tags/1.0.0.CR99/pom.xml 2008-12-13 15:17:04 UTC (rev 7326)
+++ searchable/tags/1.0.0.CR99/pom.xml 2008-12-13 15:17:12 UTC (rev 7327)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <jbosscache-searchable-version>1.0.0-SNAPSHOT</jbosscache-searchable-version>
+ <jbosscache-searchable-version>1.0.0.CR99</jbosscache-searchable-version>
<!-- By default only generate Javadocs when we package the module. -->
<javadocPhase>package</javadocPhase>
</properties>
Modified: searchable/tags/1.0.0.CR99/src/main/java/org/jboss/cache/Version.java
===================================================================
--- searchable/tags/1.0.0.CR99/src/main/java/org/jboss/cache/Version.java 2008-12-13 15:17:04 UTC (rev 7326)
+++ searchable/tags/1.0.0.CR99/src/main/java/org/jboss/cache/Version.java 2008-12-13 15:17:12 UTC (rev 7327)
@@ -8,7 +8,7 @@
public class Version
{
//version string - should correspond with the version in the pom
- private static final String version = "1.0.0-SNAPSHOT";
+ private static final String version = "1.0.0.CR99";
public static void main(String[] args)
{
System.out.println("\nJBoss Cache Searchable Edition\nVersion:\t" + version + "\n\n");
16 years, 3 months
JBoss Cache SVN: r7326 - searchable/tags.
by jbosscache-commits＠lists.jboss.org
Author: navssurtani
Date: 2008-12-13 10:17:04 -0500 (Sat, 13 Dec 2008)
New Revision: 7326
Added:
searchable/tags/1.0.0.CR99/
Log:
JBoss Cache Searchable Release Script: Tagging 1.0.0.CR99
Copied: searchable/tags/1.0.0.CR99 (from rev 7325, searchable/trunk)
16 years, 3 months
JBoss Cache SVN: r7325 - searchable/tags.
by jbosscache-commits＠lists.jboss.org
Author: navssurtani
Date: 2008-12-13 10:16:48 -0500 (Sat, 13 Dec 2008)
New Revision: 7325
Removed:
searchable/tags/1.0.0.CR99/
Log:
testing script
16 years, 3 months
JBoss Cache SVN: r7324 - searchable/tags/1.0.0.CR99.
by jbosscache-commits＠lists.jboss.org
Author: navssurtani
Date: 2008-12-13 10:12:31 -0500 (Sat, 13 Dec 2008)
New Revision: 7324
Added:
searchable/tags/1.0.0.CR99/trunk/
Log:
JBoss Cache Searchable Release Script: Tagging 1.0.0.CR99
Copied: searchable/tags/1.0.0.CR99/trunk (from rev 7323, searchable/trunk)
16 years, 3 months
JBoss Cache SVN: r7323 - searchable/tags.
by jbosscache-commits＠lists.jboss.org
Author: navssurtani
Date: 2008-12-13 10:08:12 -0500 (Sat, 13 Dec 2008)
New Revision: 7323
Added:
searchable/tags/1.0.0.CR99/
Log:
JBoss Cache Searchable Release Script: Tagging 1.0.0.CR99
Copied: searchable/tags/1.0.0.CR99 (from rev 7322, searchable/trunk)
16 years, 3 months
JBoss Cache SVN: r7322 - in searchable/trunk: src/main/java/org/jboss/cache and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: navssurtani
Date: 2008-12-13 10:06:39 -0500 (Sat, 13 Dec 2008)
New Revision: 7322
Added:
searchable/trunk/src/main/java/org/jboss/cache/Version.java
Modified:
searchable/trunk/pom.xml
searchable/trunk/release.sh
Log:
Updated release script and added a Version.java
Modified: searchable/trunk/pom.xml
===================================================================
--- searchable/trunk/pom.xml 2008-12-13 11:49:23 UTC (rev 7321)
+++ searchable/trunk/pom.xml 2008-12-13 15:06:39 UTC (rev 7322)
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search</artifactId>
- <version>3.1.0.Beta2</version>
+ <version>3.1.0.Beta1</version>
</dependency>
<dependency>
Modified: searchable/trunk/release.sh
===================================================================
--- searchable/trunk/release.sh 2008-12-13 11:49:23 UTC (rev 7321)
+++ searchable/trunk/release.sh 2008-12-13 15:06:39 UTC (rev 7322)
@@ -1,3 +1,4 @@
+#!/bin/bash
# Variables
# SVN directory on repo: -
@@ -13,7 +14,7 @@
localMvn="/Users/Navin/Code/maven2_repo/org/jboss/cache/jbosscache-searchable"
# Docs
-docsDir="/Users/Navin/Code/ReleaseDocs"
+# docsDir="/Users/Navin/Code/ReleaseDocs"
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -35,7 +36,7 @@
then
echo "Missing version number!"
help
- exit 0
+ exit 1
fi
if [[ $ver =~ ^[1-9]\.[0-9]\.[0-9]\.(GA|(ALPHA|BETA|CR|SP)[1-9][0-9]?)$ ]]
@@ -45,7 +46,7 @@
else
echo "Incorrect version format for version $ver!"
help
- exit 0
+ exit 1
fi
echo "validate() function run ok!"
}
@@ -62,7 +63,9 @@
build()
{
- mvn clean deploy -Dmaven.test.skip.exec=True -PDocs
+ cd $localTagsDir
+ cd $ver
+ mvn clean deploy -Dmaven.test.skip.exec=true -PDocs
echo "build() function run ok!"
}
@@ -74,6 +77,16 @@
echo "checkIntoRepo function run ok!"
}
+setVersion()
+{
+ # Change pom.xml and Version.java
+ sed -e "s/<jbosscache-searchable-version>[1-9]\.[0-9]\.[0-9]-SNAPSHOT/<jbosscache-searchable-version>$ver/g" pom.xml > newpom.xml
+ mv newpom.xml pom.xml
+ sed -e "s/\"[1-9]\.[0-9]\.[0-9]-SNAPSHOT\"/\"$ver\"/g" src/main/java/org/jboss/cache/Version.java > tmp.java
+ mv tmp.java src/main/java/org/jboss/cache/Version.java
+ svn ci -m "JBoss Cache Release Script: Updating $ver" pom.xml src/main/java/org/jboss/cache/Version.java
+}
+
docs()
{
cd $docsDir
@@ -97,9 +110,10 @@
echo "This is the JBoss Cache Searchable release script"
validate
tag
+setVersion
build
checkIntoRepo
-docs
+#docs
echo 'Done!'
echo 'Update www.jboss.org about new release'
echo 'Update wiki'
Added: searchable/trunk/src/main/java/org/jboss/cache/Version.java
===================================================================
--- searchable/trunk/src/main/java/org/jboss/cache/Version.java (rev 0)
+++ searchable/trunk/src/main/java/org/jboss/cache/Version.java 2008-12-13 15:06:39 UTC (rev 7322)
@@ -0,0 +1,16 @@
+package org.jboss.cache;
+
+/**
+ * Spits out the version number.
+ *
+ * @author Navin Surtani (<a href="mailto:nsurtani@redhat.com">nsurtani(a)redhat.com</a>)
+ */
+public class Version
+{
+ //version string - should correspond with the version in the pom
+ private static final String version = "1.0.0-SNAPSHOT";
+ public static void main(String[] args)
+ {
+ System.out.println("\nJBoss Cache Searchable Edition\nVersion:\t" + version + "\n\n");
+ }
+}
16 years, 3 months
JBoss Cache SVN: r7321 - in core/branches/flat/src/main/java/org/jboss/starobrno: cluster and 6 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-12-13 06:49:23 -0500 (Sat, 13 Dec 2008)
New Revision: 7321
Added:
core/branches/flat/src/main/java/org/jboss/starobrno/util/LinkedList.java
Modified:
core/branches/flat/src/main/java/org/jboss/starobrno/atomic/AtomicHashMapDelta.java
core/branches/flat/src/main/java/org/jboss/starobrno/cluster/ReplicationQueue.java
core/branches/flat/src/main/java/org/jboss/starobrno/context/TransactionContextImpl.java
core/branches/flat/src/main/java/org/jboss/starobrno/eviction/algorithms/lfu/LFUQueue.java
core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/InterceptorChain.java
core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/LockingInterceptor.java
core/branches/flat/src/main/java/org/jboss/starobrno/loader/FileCacheLoader.java
core/branches/flat/src/main/java/org/jboss/starobrno/transaction/DummyTransactionManager.java
core/branches/flat/src/main/java/org/jboss/starobrno/util/ReflectionUtil.java
Log:
Used custom LinkedList impl
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/atomic/AtomicHashMapDelta.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/atomic/AtomicHashMapDelta.java 2008-12-13 00:54:00 UTC (rev 7320)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/atomic/AtomicHashMapDelta.java 2008-12-13 11:49:23 UTC (rev 7321)
@@ -23,11 +23,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.starobrno.util.LinkedList;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.util.LinkedList;
import java.util.List;
/**
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/cluster/ReplicationQueue.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/cluster/ReplicationQueue.java 2008-12-13 00:54:00 UTC (rev 7320)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/cluster/ReplicationQueue.java 2008-12-13 11:49:23 UTC (rev 7321)
@@ -31,9 +31,9 @@
import org.jboss.starobrno.factories.annotations.Start;
import org.jboss.starobrno.factories.annotations.Stop;
import org.jboss.starobrno.remoting.RPCManager;
+import org.jboss.starobrno.util.LinkedList;
import java.util.ArrayList;
-import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/context/TransactionContextImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/context/TransactionContextImpl.java 2008-12-13 00:54:00 UTC (rev 7320)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/context/TransactionContextImpl.java 2008-12-13 11:49:23 UTC (rev 7321)
@@ -27,11 +27,16 @@
import org.jboss.starobrno.transaction.GlobalTransaction;
import org.jboss.starobrno.util.FastCopyHashMap;
import org.jboss.starobrno.util.Immutables;
+import org.jboss.starobrno.util.LinkedList;
import javax.transaction.RollbackException;
import javax.transaction.SystemException;
import javax.transaction.Transaction;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
/**
* A transaction context specially geared to dealing with MVCC.
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/eviction/algorithms/lfu/LFUQueue.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/eviction/algorithms/lfu/LFUQueue.java 2008-12-13 00:54:00 UTC (rev 7320)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/eviction/algorithms/lfu/LFUQueue.java 2008-12-13 11:49:23 UTC (rev 7321)
@@ -23,8 +23,17 @@
import org.jboss.starobrno.eviction.KeyEntry;
import org.jboss.starobrno.eviction.algorithms.SortedEvictionQueue;
+import org.jboss.starobrno.util.LinkedList;
-import java.util.*;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
/**
* LFUQueue EvictionQueue implementation for LFU Policy.
@@ -40,7 +49,7 @@
private LinkedList<KeyEntry<K>> evictionList;
private Set<KeyEntry<K>> removalQueue;
private Comparator<KeyEntry<K>> comparator;
-
+
private int numElements = 0;
protected LFUQueue()
@@ -67,7 +76,8 @@
{
evictionList.removeFirst();
removalQueue.remove(ne);
- } else
+ }
+ else
{
break;
}
@@ -200,10 +210,12 @@
if (neNodeHits > ne2NodeHits)
{
return 1;
- } else if (neNodeHits < ne2NodeHits)
+ }
+ else if (neNodeHits < ne2NodeHits)
{
return -1;
- } else if (neNodeHits == ne2NodeHits)
+ }
+ else if (neNodeHits == ne2NodeHits)
{
return 0;
}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/InterceptorChain.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/InterceptorChain.java 2008-12-13 00:54:00 UTC (rev 7320)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/InterceptorChain.java 2008-12-13 11:49:23 UTC (rev 7321)
@@ -30,10 +30,10 @@
import org.jboss.starobrno.factories.annotations.Start;
import org.jboss.starobrno.interceptors.base.CommandInterceptor;
import org.jboss.starobrno.invocation.InvocationContextContainer;
+import org.jboss.starobrno.util.LinkedList;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.LinkedList;
import java.util.List;
/**
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/LockingInterceptor.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/LockingInterceptor.java 2008-12-13 00:54:00 UTC (rev 7320)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/LockingInterceptor.java 2008-12-13 11:49:23 UTC (rev 7321)
@@ -28,7 +28,12 @@
import org.jboss.starobrno.commands.tx.CommitCommand;
import org.jboss.starobrno.commands.tx.PrepareCommand;
import org.jboss.starobrno.commands.tx.RollbackCommand;
-import org.jboss.starobrno.commands.write.*;
+import org.jboss.starobrno.commands.write.ClearCommand;
+import org.jboss.starobrno.commands.write.EvictCommand;
+import org.jboss.starobrno.commands.write.PutKeyValueCommand;
+import org.jboss.starobrno.commands.write.PutMapCommand;
+import org.jboss.starobrno.commands.write.RemoveCommand;
+import org.jboss.starobrno.commands.write.ReplaceCommand;
import org.jboss.starobrno.container.DataContainer;
import org.jboss.starobrno.container.MVCCEntry;
import org.jboss.starobrno.container.MVCCEntryCreator;
@@ -37,8 +42,8 @@
import org.jboss.starobrno.factories.annotations.Start;
import org.jboss.starobrno.interceptors.base.CommandInterceptor;
import org.jboss.starobrno.lock.LockManager;
-import org.jboss.starobrno.util.ObjectDuplicator;
+import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
@@ -267,14 +272,22 @@
{
if (useReadCommitted)
{
- Map<Object, MVCCEntry> original = ctx.getLookedUpEntries();
- if (!original.isEmpty())
+ Map<Object, MVCCEntry> lookedUpEntries = ctx.getLookedUpEntries();
+ if (!lookedUpEntries.isEmpty())
{
- Map<Object, MVCCEntry> defensiveCopy = ObjectDuplicator.duplicateMap(original);
- for (Map.Entry<Object, MVCCEntry> e : defensiveCopy.entrySet())
+ // This should be a Set but we can use an ArrayList instead for efficiency since we know that the elements
+ // will always be unique as they are keys from a Map. Also, we know the maximum size so this ArrayList
+ // should never resize.
+ List<Object> keysToRemove = new ArrayList<Object>(lookedUpEntries.size());
+ for (Map.Entry<Object, MVCCEntry> e : lookedUpEntries.entrySet())
{
- if (!e.getValue().isChanged()) ctx.removeLookedUpEntry(e.getKey());
+ if (!e.getValue().isChanged()) keysToRemove.add(e.getKey());
}
+
+ if (!keysToRemove.isEmpty())
+ {
+ for (Object key : keysToRemove) ctx.removeLookedUpEntry(key);
+ }
}
}
}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/loader/FileCacheLoader.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/loader/FileCacheLoader.java 2008-12-13 00:54:00 UTC (rev 7320)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/loader/FileCacheLoader.java 2008-12-13 11:49:23 UTC (rev 7321)
@@ -21,6 +21,16 @@
*/
package org.jboss.starobrno.loader;
+import net.jcip.annotations.ThreadSafe;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.starobrno.CacheException;
+import org.jboss.starobrno.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
+import org.jboss.starobrno.lock.StripedLock;
+import org.jboss.starobrno.marshall.EntryData;
+import org.jboss.starobrno.util.LinkedList;
+import org.jboss.util.stream.MarshalledValueInputStream;
+
import java.io.Closeable;
import java.io.File;
import java.io.FileInputStream;
@@ -29,21 +39,10 @@
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.util.LinkedList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import net.jcip.annotations.ThreadSafe;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.starobrno.CacheException;
-import org.jboss.starobrno.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
-import org.jboss.starobrno.lock.StripedLock;
-import org.jboss.starobrno.marshall.EntryData;
-import org.jboss.util.stream.MarshalledValueInputStream;
-
/**
* Simple file-based CacheLoader implementation. Nodes are directories, attributes of a node is a file in the directory
* <p/>
@@ -69,7 +68,7 @@
* @version $Id$
*/
@ThreadSafe
-public class FileCacheLoader<K,V> extends AbstractCacheLoader<K,V>
+public class FileCacheLoader<K, V> extends AbstractCacheLoader<K, V>
{
File root = null;
String rootPath = null;
@@ -234,7 +233,7 @@
try
{
File file = getFile(key, false);
- if (! file.exists())
+ if (!file.exists())
return null;
retval = loadValue(key);
@@ -338,7 +337,7 @@
input = new MarshalledValueInputStream(fileIn);
V value = (V) getMarshaller().objectFromObjectStream(input);
K key = (K) getMarshaller().objectFromObjectStream(input);
- return new EntryData<K,V>(key, value);
+ return new EntryData<K, V>(key, value);
}
catch (FileNotFoundException fnfe)
{
@@ -436,7 +435,7 @@
public void clear()
{
File directory = new File(rootPath);
- if (! directory.exists())
+ if (!directory.exists())
return;
File[] files = directory.listFiles();
@@ -460,9 +459,9 @@
public List<EntryData<K, V>> getAllEntries()
{
- List<EntryData<K,V>> entries = new LinkedList<EntryData<K,V>>();
+ List<EntryData<K, V>> entries = new LinkedList<EntryData<K, V>>();
File directory = new File(rootPath);
- if (! directory.exists())
+ if (!directory.exists())
return entries;
File[] files = directory.listFiles();
@@ -475,7 +474,7 @@
lock(file.getName());
if (file.exists())
{
- EntryData<K,V> entry = loadEntry(file);
+ EntryData<K, V> entry = loadEntry(file);
if (entry != null)
entries.add(entry);
}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/transaction/DummyTransactionManager.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/transaction/DummyTransactionManager.java 2008-12-13 00:54:00 UTC (rev 7320)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/transaction/DummyTransactionManager.java 2008-12-13 11:49:23 UTC (rev 7321)
@@ -56,7 +56,7 @@
try
{
Properties p = new Properties();
- p.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
+// p.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
Context ctx = new InitialContext(p);
ctx.bind("java:/TransactionManager", instance);
ctx.bind("UserTransaction", utx);
Added: core/branches/flat/src/main/java/org/jboss/starobrno/util/LinkedList.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/util/LinkedList.java (rev 0)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/util/LinkedList.java 2008-12-13 11:49:23 UTC (rev 7321)
@@ -0,0 +1,17 @@
+package org.jboss.starobrno.util;
+
+import java.util.Iterator;
+
+/**
+ * Similar to JDK LinkedList, except this implementation uses a more efficient iterator making use of the next and previous
+ * object references in each Entry.
+ */
+
+public class LinkedList<E> extends java.util.LinkedList<E>
+{
+ @Override
+ public Iterator<E> iterator()
+ {
+ return listIterator(0);
+ }
+}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/util/ReflectionUtil.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/util/ReflectionUtil.java 2008-12-13 00:54:00 UTC (rev 7320)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/util/ReflectionUtil.java 2008-12-13 11:49:23 UTC (rev 7321)
@@ -30,7 +30,6 @@
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Collection;
-import java.util.LinkedList;
import java.util.List;
/**
16 years, 3 months
JBoss Cache SVN: r7320 - in core/trunk/src/test/java/org/jboss/cache/jmx: deprecated and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-12-12 19:54:00 -0500 (Fri, 12 Dec 2008)
New Revision: 7320
Modified:
core/trunk/src/test/java/org/jboss/cache/jmx/JmxRegistrationManagerTest.java
core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTest.java
core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/NotificationTest.java
Log:
deprecated tests don't only create local cache instaces now
Modified: core/trunk/src/test/java/org/jboss/cache/jmx/JmxRegistrationManagerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/jmx/JmxRegistrationManagerTest.java 2008-12-12 23:59:35 UTC (rev 7319)
+++ core/trunk/src/test/java/org/jboss/cache/jmx/JmxRegistrationManagerTest.java 2008-12-13 00:54:00 UTC (rev 7320)
@@ -21,9 +21,7 @@
*/
package org.jboss.cache.jmx;
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.AfterMethod;
+import org.testng.annotations.*;
import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.DefaultCacheFactory;
Modified: core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTest.java 2008-12-12 23:59:35 UTC (rev 7319)
+++ core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTest.java 2008-12-13 00:54:00 UTC (rev 7320)
@@ -234,15 +234,7 @@
printLockInfoTest(true);
}
- public void testGetLocalAddress() throws Exception
- {
- Configuration c = createConfiguration();
- c.setCacheMode(CacheMode.REPL_ASYNC);
- CacheJmxWrapperMBean<String, String> wrapper = registerWrapper(c);
- wrapper.start();
- assertTrue("Got an IpAddress", wrapper.getLocalAddress() instanceof IpAddress);
- }
-
+ @Test
public void testGetMembers() throws Exception
{
Configuration c = createConfiguration();
@@ -252,31 +244,13 @@
new UnitTestCacheFactory<String, String>().mangleConfiguration(c);
CacheJmxWrapperMBean<String, String> wrapper = registerWrapper(c);
wrapper.start();
-
- c = createConfiguration();
- c.setCacheMode(CacheMode.REPL_ASYNC);
- Cache cache2 = null;
- try
- {
- cache2 = createCache(c);
- cache2.start();
- Cache[] caches = new Cache[]{wrapper.getCache(), cache2};
- TestingUtil.blockUntilViewsReceived(caches, 5000);
-
- Address addr = wrapper.getLocalAddress();
- assertNotNull("Got an Address", addr);
- List members = wrapper.getMembers();
- assertNotNull("Got members", addr);
- assertEquals("Got correct number of members", 2, members.size());
- assertTrue("I am a member", members.contains(addr));
- }
- finally
- {
- if (cache2 != null)
- {
- cache2.destroy();
- }
- }
+ Address addr = wrapper.getLocalAddress();
+ assertNotNull("Got an Address", addr);
+ List members = wrapper.getMembers();
+ assertNotNull("Got members", addr);
+ assertEquals("Got correct number of members", 1, members.size());
+ assertTrue("Got an IpAddress", wrapper.getLocalAddress() instanceof IpAddress);
+ assertTrue("I am a member", members.contains(addr));
}
public void testDuplicateInvocation() throws Exception
@@ -373,7 +347,6 @@
String details = html ? wrapper.printCacheDetailsAsHtml() : wrapper.printCacheDetails();
-
assertTrue("Details include testing", details.contains("testing"));
assertTrue("Details include jmx", details.contains("jmx"));
assertTrue("Details include foobar", details.contains("foobar"));
Modified: core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/NotificationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/NotificationTest.java 2008-12-12 23:59:35 UTC (rev 7319)
+++ core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/NotificationTest.java 2008-12-13 00:54:00 UTC (rev 7320)
@@ -184,7 +184,6 @@
assertTrue("Expected NodePassivated notification", events.contains(Type.POSTPASSIVATE));
assertTrue("Expected NodeRemoved notification", events.contains(Type.PREREMOVE));
assertTrue("Expected NodeRemoved notification", events.contains(Type.POSTREMOVE));
- assertTrue("Expected ViewChange notification", events.contains(Type.VIEWCHANGE));
validateHealthyListener(listener);
}
@@ -280,6 +279,7 @@
private CacheSPI<Object, Object> createCache(String clusterName) throws Exception
{
Configuration config = createConfiguration(clusterName);
+ config.setCacheMode(CacheMode.LOCAL);
UnitTestCacheFactory<Object, Object> factory = new UnitTestCacheFactory<Object, Object>();
CacheSPI<Object, Object> cache = (CacheSPI<Object, Object>) factory.createCache(config, false, getClass());
16 years, 3 months
