JBoss Cache SVN: r4610 - support/trunk/common.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2007-10-12 13:22:14 -0400 (Fri, 12 Oct 2007)
New Revision: 4610
Modified:
support/trunk/common/pom.xml
Log:
Rolled back surefire version update
Modified: support/trunk/common/pom.xml
===================================================================
--- support/trunk/common/pom.xml 2007-10-12 17:01:11 UTC (rev 4609)
+++ support/trunk/common/pom.xml 2007-10-12 17:22:14 UTC (rev 4610)
@@ -136,7 +136,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4-jboss-1-SNAPSHOT</version>
+ <version>2.3</version>
<configuration>
<systemProperties>
<property>
@@ -199,7 +199,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4-jboss-1-SNAPSHOT</version>
+ <version>2.3</version>
</plugin>
<!-- DISABLE - Maven doesn't build the classpath correctly
@@ -345,7 +345,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4-jboss-1-SNAPSHOT</version>
+ <version>2.3</version>
<configuration>
<systemProperties>
<property>
@@ -364,7 +364,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4-jboss-1-SNAPSHOT</version>
+ <version>2.3</version>
<configuration>
<reportsDirectory>${project.build.directory}/jgroups-tcp-reports</reportsDirectory>
<outputName>jgroups-tcp-report</outputName>
18 years, 6 months
JBoss Cache SVN: r4609 - support/trunk/common.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2007-10-12 13:01:11 -0400 (Fri, 12 Oct 2007)
New Revision: 4609
Modified:
support/trunk/common/pom.xml
Log:
UPdated surefire plugin
Modified: support/trunk/common/pom.xml
===================================================================
--- support/trunk/common/pom.xml 2007-10-12 16:42:44 UTC (rev 4608)
+++ support/trunk/common/pom.xml 2007-10-12 17:01:11 UTC (rev 4609)
@@ -136,7 +136,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4-jboss-1-SNAPSHOT</version>
<configuration>
<systemProperties>
<property>
@@ -199,7 +199,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4-jboss-1-SNAPSHOT</version>
</plugin>
<!-- DISABLE - Maven doesn't build the classpath correctly
@@ -345,6 +345,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4-jboss-1-SNAPSHOT</version>
<configuration>
<systemProperties>
<property>
@@ -363,6 +364,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4-jboss-1-SNAPSHOT</version>
<configuration>
<reportsDirectory>${project.build.directory}/jgroups-tcp-reports</reportsDirectory>
<outputName>jgroups-tcp-report</outputName>
18 years, 6 months
JBoss Cache SVN: r4608 - core/trunk/src/test/java/org/jboss/cache/buddyreplication.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2007-10-12 12:42:44 -0400 (Fri, 12 Oct 2007)
New Revision: 4608
Modified:
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java
Log:
cleaned up code
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2007-10-12 16:23:47 UTC (rev 4607)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2007-10-12 16:42:44 UTC (rev 4608)
@@ -29,6 +29,7 @@
import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.loader.CacheLoader;
import org.jboss.cache.loader.CacheLoaderManager;
+import org.jboss.cache.loader.DummyInMemoryCacheLoader;
import org.jboss.cache.misc.TestingUtil;
import org.jboss.cache.xml.XmlHelper;
import org.jgroups.Address;
@@ -212,9 +213,6 @@
protected List<CacheImpl<Object, Object>> createCachesWithCacheLoader(int numCaches, boolean useDataGravitation, boolean removeOnFind, boolean passivation, boolean fetchPersistent) throws Exception
{
- String tmpLoc = System.getProperty("java.io.tmpdir", "/tmp");
- tmpLoc += File.separator + "BuddyReplicationTestsBase-";
-
List<CacheImpl<Object, Object>> caches = new ArrayList<CacheImpl<Object, Object>>();
for (int i = 0; i < numCaches; i++)
{
@@ -236,8 +234,7 @@
"<preload></preload>\n" +
"<cacheloader>\n" +
- "<class>org.jboss.cache.loader.DummyInMemoryCacheLoader</class>\n" +
-// "<properties>location=" + (location) + "</properties>\n" +
+ "<class>"+ DummyInMemoryCacheLoader.class.getName() +"</class>\n" +
"<async>false</async>\n" +
"<shared>false</shared>\n" +
"<fetchPersistentState>" + fetchPersistent + "</fetchPersistentState>\n" +
18 years, 6 months
JBoss Cache SVN: r4607 - in core/trunk: src/main/java/org/jboss/cache and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2007-10-12 12:23:47 -0400 (Fri, 12 Oct 2007)
New Revision: 4607
Modified:
core/trunk/pom.xml
core/trunk/src/main/java/org/jboss/cache/Version.java
Log:
Updated version info
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2007-10-12 14:38:51 UTC (rev 4606)
+++ core/trunk/pom.xml 2007-10-12 16:23:47 UTC (rev 4607)
@@ -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-core-version>2.1.0.BETA1</jbosscache-core-version>
+ <jbosscache-core-version>2.1.0.CR1</jbosscache-core-version>
</properties>
<parent>
<groupId>org.jboss.cache</groupId>
Modified: core/trunk/src/main/java/org/jboss/cache/Version.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/Version.java 2007-10-12 14:38:51 UTC (rev 4606)
+++ core/trunk/src/main/java/org/jboss/cache/Version.java 2007-10-12 16:23:47 UTC (rev 4607)
@@ -11,7 +11,7 @@
@Immutable
public class Version
{
- public static final String version = "2.1.0.BETA1";
+ public static final String version = "2.1.0.CR1";
public static final String codename = "Alegrias";
public static final String cvs = "$Id: Version.java 4592 2007-10-10 16:44:36Z manik.surtani(a)jboss.com $";
static final byte[] version_id = {'0', '2', '1', '0', 'B'};
18 years, 6 months
JBoss Cache SVN: r4606 - core/trunk/src/main/java/org/jboss/cache/interceptors.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2007-10-12 10:38:51 -0400 (Fri, 12 Oct 2007)
New Revision: 4606
Modified:
core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
Log:
Genericised
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 2007-10-12 14:28:52 UTC (rev 4605)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 2007-10-12 14:38:51 UTC (rev 4606)
@@ -17,7 +17,6 @@
import org.jboss.cache.buddyreplication.BuddyManager;
import org.jboss.cache.buddyreplication.GravitateResult;
import org.jboss.cache.config.Configuration;
-import org.jboss.cache.loader.ClusteredCacheLoader;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
@@ -55,7 +54,7 @@
private BuddyManager buddyManager;
private boolean syncCommunications = false;
private Log log = LogFactory.getLog(DataGravitatorInterceptor.class);
- private Map transactionMods = new ConcurrentHashMap();
+ private Map<GlobalTransaction, MethodCall> transactionMods = new ConcurrentHashMap<GlobalTransaction, MethodCall>();
public void setCache(CacheSPI cache)
{
@@ -184,12 +183,12 @@
private void doPrepare(GlobalTransaction gtx, InvocationContext ctx) throws Throwable
{
- MethodCall cleanup = (MethodCall) transactionMods.get(gtx);
+ MethodCall cleanup = transactionMods.get(gtx);
if (log.isTraceEnabled()) log.trace("Broadcasting prepare for cleanup ops " + cleanup);
if (cleanup != null)
{
MethodCall prepare;
- List mods = new ArrayList(1);
+ List<MethodCall> mods = new ArrayList<MethodCall>(1);
mods.add(cleanup);
if (configuration.isNodeLockingOptimistic())
{
@@ -366,6 +365,7 @@
return result;
}
+ @SuppressWarnings("unchecked")
private void createNode(List<NodeData> nodeData, boolean localOnly) throws CacheException
{
for (NodeData data : nodeData)
@@ -384,7 +384,8 @@
}
}
- private void createNodesLocally(Fqn<Object> fqn, Map data) throws CacheException
+ @SuppressWarnings("unchecked")
+ private void createNodesLocally(Fqn<?> fqn, Map<?, ?> data) throws CacheException
{
int treeNodeSize;
if ((treeNodeSize = fqn.size()) == 0) return;
@@ -421,13 +422,13 @@
}
@SuppressWarnings("unchecked")
- private boolean localBackupExists(Fqn fqn)
+ private boolean localBackupExists(Fqn<?> fqn)
{
boolean exists = false;
for (Node node : getBackupRootCollection())
{
- Fqn newSearchFqn = new Fqn(node.getFqn(), fqn);
+ Fqn<?> newSearchFqn = new Fqn(node.getFqn(), fqn);
exists = cache.peek(newSearchFqn, false) != null;
if (exists) break;
}
@@ -466,7 +467,7 @@
private Collection<Node> getBackupRootCollection()
{
NodeSPI backupRoot = cache.peek(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, true);
- return backupRoot == null ? Collections.EMPTY_SET : backupRoot.getChildrenDirect();
+ return backupRoot == null ? Collections.emptySet() : backupRoot.getChildrenDirect();
}
private static class BackupData
18 years, 6 months
JBoss Cache SVN: r4605 - core/trunk/src/main/java/org/jboss/cache/marshall.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2007-10-12 10:28:52 -0400 (Fri, 12 Oct 2007)
New Revision: 4605
Modified:
core/trunk/src/main/java/org/jboss/cache/marshall/NodeData.java
Log:
Genericised
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/NodeData.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/NodeData.java 2007-10-12 14:24:34 UTC (rev 4604)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/NodeData.java 2007-10-12 14:28:52 UTC (rev 4605)
@@ -16,8 +16,8 @@
*/
public class NodeData implements Externalizable
{
- private Fqn fqn = null;
- private Map<Object, Object> attrs = null;
+ private Fqn<?> fqn = null;
+ private Map<?, ?> attrs = null;
static final long serialVersionUID = -7571995794010294485L;
@@ -25,18 +25,18 @@
{
}
- public NodeData(Fqn fqn)
+ public NodeData(Fqn<?> fqn)
{
this.fqn = fqn;
}
- public NodeData(Fqn fqn, Map attrs)
+ public NodeData(Fqn<?> fqn, Map<?, ?> attrs)
{
this.fqn = fqn;
this.attrs = attrs;
}
- public NodeData(String fqn, Map attrs)
+ public NodeData(String fqn, Map<?, ?> attrs)
{
this.fqn = Fqn.fromString(fqn);
this.attrs = attrs;
@@ -76,6 +76,7 @@
}
}
+ @SuppressWarnings("unchecked")
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
{
fqn = (Fqn) in.readObject();
18 years, 6 months
JBoss Cache SVN: r4604 - core/trunk/src/main/java/org/jboss/cache/interceptors.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2007-10-12 10:24:34 -0400 (Fri, 12 Oct 2007)
New Revision: 4604
Modified:
core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
Log:
JBCACHE-1186 - Make use of JGroups 2.6 RspFilter to filter responses that come back
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 2007-10-12 14:23:56 UTC (rev 4603)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 2007-10-12 14:24:34 UTC (rev 4604)
@@ -17,6 +17,7 @@
import org.jboss.cache.buddyreplication.BuddyManager;
import org.jboss.cache.buddyreplication.GravitateResult;
import org.jboss.cache.config.Configuration;
+import org.jboss.cache.loader.ClusteredCacheLoader;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
@@ -25,6 +26,7 @@
import org.jboss.cache.transaction.TransactionEntry;
import org.jgroups.Address;
import org.jgroups.blocks.GroupRequest;
+import org.jgroups.blocks.RspFilter;
import java.util.ArrayList;
import java.util.Collection;
@@ -321,7 +323,7 @@
MethodCall dGrav = MethodCallFactory.create(MethodDeclarations.dataGravitationMethod, fqn, searchSubtrees);
// doing a GET_ALL is crappy but necessary since JGroups' GET_FIRST could return null results from nodes that do
// not have either the primary OR backup, and stop polling other valid nodes.
- List resps = cache.getRPCManager().callRemoteMethods(mbrs, dGrav, GroupRequest.GET_ALL, true, buddyManager.getBuddyCommunicationTimeout());
+ List resps = cache.getRPCManager().callRemoteMethods(mbrs, dGrav, GroupRequest.GET_FIRST, true, buddyManager.getBuddyCommunicationTimeout(), new ResponseValidityFilter());
if (log.isTraceEnabled())
{
log.trace("got responses " + resps);
@@ -382,7 +384,7 @@
}
}
- private void createNodesLocally(Fqn fqn, Map data) throws CacheException
+ private void createNodesLocally(Fqn<Object> fqn, Map data) throws CacheException
{
int treeNodeSize;
if ((treeNodeSize = fqn.size()) == 0) return;
@@ -390,7 +392,7 @@
for (int i = 0; i < treeNodeSize; i++)
{
Object child_name = fqn.get(i);
- NodeSPI child_node = n.addChildDirect(new Fqn(child_name));
+ NodeSPI child_node = n.addChildDirect(new Fqn<Object>(child_name));
if (child_node == null)
{
if (log.isTraceEnabled())
@@ -418,6 +420,7 @@
return (Fqn) args[MethodDeclarations.isCrudMethod(methodId) ? 1 : 0];
}
+ @SuppressWarnings("unchecked")
private boolean localBackupExists(Fqn fqn)
{
boolean exists = false;
@@ -459,6 +462,7 @@
return data;
}
+ @SuppressWarnings("unchecked")
private Collection<Node> getBackupRootCollection()
{
NodeSPI backupRoot = cache.peek(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, true);
@@ -479,5 +483,23 @@
}
}
+ public static class ResponseValidityFilter implements RspFilter
+ {
+ private int numValidResponses = 0;
+ public boolean isAcceptable(Object object, Address address)
+ {
+ if (!(object instanceof GravitateResult)) return false;
+
+ GravitateResult response = (GravitateResult) object;
+ if (response.isDataFound()) numValidResponses++;
+
+ return response.isDataFound();
+ }
+
+ public boolean needMoreResponses()
+ {
+ return numValidResponses < 1;
+ }
+ }
}
18 years, 6 months
JBoss Cache SVN: r4603 - core/trunk/src/main/java/org/jboss/cache.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2007-10-12 10:23:56 -0400 (Fri, 12 Oct 2007)
New Revision: 4603
Modified:
core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
Log:
Removed debug noise
Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java 2007-10-12 13:56:19 UTC (rev 4602)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java 2007-10-12 14:23:56 UTC (rev 4603)
@@ -2910,8 +2910,6 @@
// for now, perform a very simple series of getData calls.
InvocationContext ctx = getInvocationContext();
- log.debug("*****************>>>>> " + printLockInfo());
-
try
{
ctx.setOriginLocal(false);
18 years, 6 months
JBoss Cache SVN: r4602 - in core/trunk/src/test/java/org/jboss/cache: replicated and 1 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2007-10-12 09:56:19 -0400 (Fri, 12 Oct 2007)
New Revision: 4602
Modified:
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java
core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferUnderLoadTest.java
Log:
Re-enabled tests that need to pass for CR1.
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java 2007-10-11 17:19:15 UTC (rev 4601)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java 2007-10-12 13:56:19 UTC (rev 4602)
@@ -235,7 +235,6 @@
*
* @throws Exception
*/
- @Test (enabled = false) // Fix for 2.1.0.CR1
public void testGravitationOfEvictedNodes() throws Exception
{
CacheImpl<Object,Object> cache0 = createCacheWithCacheLoader(true, true, passivation, true, false);
Modified: core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java 2007-10-11 17:19:15 UTC (rev 4601)
+++ core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java 2007-10-12 13:56:19 UTC (rev 4602)
@@ -63,8 +63,6 @@
String delay = ":DELAY(in_delay=100;out_delay=100)";
String newCfg = jgroupsCfg.substring(0, jgroupsCfg.indexOf(":")) + delay + jgroupsCfg.substring(jgroupsCfg.indexOf(":"));
- System.out.println("JG " + jgroupsCfg);System.out.println("NEW: " + newCfg);
-
cache1.getConfiguration().setClusterConfig(newCfg);
cache2.getConfiguration().setClusterConfig(newCfg);
Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferUnderLoadTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferUnderLoadTest.java 2007-10-11 17:19:15 UTC (rev 4601)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferUnderLoadTest.java 2007-10-12 13:56:19 UTC (rev 4602)
@@ -25,7 +25,7 @@
* @author Bela Ban
* @version $Id$
*/
-@Test(groups = {"functional"}, enabled = false) // Fix for 2.1.0.CR1
+@Test(groups = {"functional"})
public class StateTransferUnderLoadTest
{
Cache<Object, Object> cache1, cache2;
18 years, 6 months
