August 2009 - jbosscache-commits - Jboss List Archives

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-08-11 07:26:17 -0400 (Tue, 11 Aug 2009) New Revision: 8180 Modified: core/trunk/pom.xml Log: Back to JGroups 2.6.9 Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2009-08-11 11:25:22 UTC (rev 8179) +++ core/trunk/pom.xml 2009-08-11 11:26:17 UTC (rev 8180) @@ -27,8 +27,8 @@ <dependency> <groupId>jgroups</groupId> <artifactId>jgroups</artifactId> - <version>2.8.0.Beta2</version> -  +  + <version>2.6.9.GA</version> </dependency> <!--

15 years, 4 months

1
0
0 / 0

JBoss Cache SVN: r8179 - core/trunk.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-08-11 07:25:22 -0400 (Tue, 11 Aug 2009) New Revision: 8179 Modified: core/trunk/pom.xml Log: Updated deps, versions Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2009-08-11 11:24:10 UTC (rev 8178) +++ core/trunk/pom.xml 2009-08-11 11:25:22 UTC (rev 8179) @@ -473,7 +473,7 @@ <activeByDefault>false</activeByDefault> </activation> <properties> - <jbosscache-core-version>3.0.3-SNAPSHOT-JBossAS</jbosscache-core-version> + <jbosscache-core-version>3.2.0-SNAPSHOT-JBossAS</jbosscache-core-version> <defaultTestGroup>functional,unit</defaultTestGroup> <protocol.stack>tcp</protocol.stack> </properties> @@ -481,18 +481,18 @@ <dependency> <groupId>jgroups</groupId> <artifactId>jgroups</artifactId> - <version>2.6.7.GA</version> + <version>2.6.9.GA</version> </dependency>  <dependency> <groupId>org.jboss.javaee</groupId> <artifactId>jboss-javaee</artifactId> - <version>5.0.0.GA</version> + <version>5.0.1.GA</version> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> - <version>2.2.10.GA</version> + <version>2.2.14.GA</version> </dependency> <dependency> <groupId>commons-logging</groupId>

15 years, 4 months

1
0
0 / 0

JBoss Cache SVN: r8178 - core/trunk/src/main/java/org/jboss/cache/transaction.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-08-11 07:24:10 -0400 (Tue, 11 Aug 2009) New Revision: 8178 Modified: core/trunk/src/main/java/org/jboss/cache/transaction/DummyContext.java Log: Ability to serialize Modified: core/trunk/src/main/java/org/jboss/cache/transaction/DummyContext.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/transaction/DummyContext.java 2009-08-10 12:42:28 UTC (rev 8177) +++ core/trunk/src/main/java/org/jboss/cache/transaction/DummyContext.java 2009-08-11 11:24:10 UTC (rev 8178) @@ -30,6 +30,10 @@ import javax.naming.NamingException; import java.util.HashMap; import java.util.Hashtable; +import java.io.ObjectInputStream; +import java.io.ByteArrayInputStream; +import java.io.ObjectOutputStream; +import java.io.ByteArrayOutputStream; /** * @author bela @@ -40,7 +44,18 @@ { HashMap<String, Object> bindings = new HashMap<String, Object>(); + boolean serializing; + public DummyContext() + { + this.serializing = false; + } + + public DummyContext(boolean serializing) + { + this.serializing = serializing; + } + /** * Retrieves the named object. * If <tt>name</tt> is empty, returns a new instance of this context @@ -69,7 +84,15 @@ */ public Object lookup(String name) throws NamingException { - return bindings.get(name); + try + { + deserialize(); + return bindings.get(name); + } + finally + { + serialize(); + } } /** @@ -89,6 +112,7 @@ */ public void bind(Name name, Object obj) throws NamingException { + bind("NAME: " + name.toString(), obj); } /** @@ -103,7 +127,15 @@ */ public void bind(String name, Object obj) throws NamingException { - bindings.put(name, obj); + try + { + deserialize(); + bindings.put(name, obj); + } + finally + { + serialize(); + } } /** @@ -128,6 +160,7 @@ */ public void rebind(Name name, Object obj) throws NamingException { + bind(name, obj); } /** @@ -141,7 +174,7 @@ */ public void rebind(String name, Object obj) throws NamingException { - bindings.put(name, obj); + bind(name, obj); } /** @@ -166,6 +199,7 @@ */ public void unbind(Name name) throws NamingException { + unbind("NAME: " + name.toString()); } /** @@ -178,7 +212,15 @@ */ public void unbind(String name) throws NamingException { - bindings.remove(name); + try + { + deserialize(); + bindings.remove(name); + } + finally + { + serialize(); + } } /** @@ -590,4 +632,50 @@ { return null; } + + byte[] bytes = null; + private void serialize() + { + if (serializing) + { + try + { + ByteArrayOutputStream bstream = new ByteArrayOutputStream(); + ObjectOutputStream oos = new ObjectOutputStream(bstream); + oos.writeObject(bindings); + oos.close(); + bstream.close(); + bytes = bstream.toByteArray(); + bindings = null; + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } + } + + @SuppressWarnings("unchecked") + private void deserialize() + { + if (serializing) + { + if (bytes == null) + bindings = new HashMap<String, Object>(); + else + { + try + { + ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(bytes)); + bindings = (HashMap<String, Object>) ois.readObject(); + ois.close(); + bytes = null; + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } + } + } }

15 years, 4 months

1
0
0 / 0

Hudson build is unstable: jboss-cache-core-trunk-jdk1.5 » JBoss Cache - Core Edition #851

by jboss-qa-internal＠redhat.com

See http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-trunk-jdk1.5/org.j...

15 years, 4 months

1
0
0 / 0

Hudson build is unstable: jboss-cache-core-trunk-jdk1.6 » JBoss Cache - Core Edition #751

by jboss-qa-internal＠redhat.com

See http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-trunk-jdk1.6/org.j...

15 years, 4 months

1
0
0 / 0

JBoss Cache SVN: r8177 - core/trunk.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-08-10 08:42:28 -0400 (Mon, 10 Aug 2009) New Revision: 8177 Modified: core/trunk/pom.xml Log: Updated version Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2009-08-10 12:42:05 UTC (rev 8176) +++ core/trunk/pom.xml 2009-08-10 12:42:28 UTC (rev 8177) @@ -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>3.1.0-SNAPSHOT</jbosscache-core-version> + <jbosscache-core-version>3.2.0-SNAPSHOT</jbosscache-core-version>  <defaultTestGroup>unit</defaultTestGroup>

15 years, 4 months

1
0
0 / 0

JBoss Cache SVN: r8176 - core/trunk/src/test/java/org/jboss/cache/optimistic.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-08-10 08:42:05 -0400 (Mon, 10 Aug 2009) New Revision: 8176 Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.java Log: Removed dependency on JGroups specifics Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java 2009-08-10 12:17:35 UTC (rev 8175) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java 2009-08-10 12:42:05 UTC (rev 8176) @@ -26,17 +26,12 @@ import org.jboss.cache.transaction.GlobalTransaction; import org.jboss.cache.transaction.TransactionSetup; import org.jboss.cache.util.TestingUtil; -import org.jgroups.Address; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; import javax.transaction.SystemException; import javax.transaction.Transaction; import javax.transaction.TransactionManager; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.LinkedList; import java.util.List; import java.util.Random; @@ -303,44 +298,4 @@ } return modifications; } - - protected class DummyAddress implements Address - { - private static final long serialVersionUID = -2628268587640985944L; - - public int compareTo(Object o) - { - return 0; - } - - public void readFrom(DataInputStream - arg0) - { - } - - public void writeTo(DataOutputStream - arg0) - { - } - - public void readExternal(ObjectInput - arg0) - { - } - - public void writeExternal(ObjectOutput - arg0) - { - } - - public int size() - { - return 0; - } - - public boolean isMulticastAddress() - { - return false; - } - } } Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java 2009-08-10 12:17:35 UTC (rev 8175) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java 2009-08-10 12:42:05 UTC (rev 8176) @@ -6,7 +6,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.cache.*; +import org.easymock.EasyMock; +import org.jboss.cache.Cache; +import org.jboss.cache.CacheSPI; +import org.jboss.cache.Fqn; +import org.jboss.cache.NodeSPI; +import org.jboss.cache.VersionedNode; import org.jboss.cache.commands.WriteCommand; import org.jboss.cache.commands.tx.CommitCommand; import org.jboss.cache.commands.tx.OptimisticPrepareCommand; @@ -215,7 +220,9 @@ GlobalTransaction remoteGtx = new GlobalTransaction(); - remoteGtx.setAddress(new DummyAddress()); + Address mockAddress = EasyMock.createNiceMock(Address.class); + + remoteGtx.setAddress(mockAddress); //hack the method call to make it have the remote globalTransaction command.setGlobalTransaction(remoteGtx); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.java 2009-08-10 12:17:35 UTC (rev 8175) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.java 2009-08-10 12:42:05 UTC (rev 8176) @@ -6,6 +6,7 @@ */ package org.jboss.cache.optimistic; +import org.easymock.EasyMock; import org.jboss.cache.CacheSPI; import org.jboss.cache.commands.WriteCommand; import org.jboss.cache.commands.tx.CommitCommand; @@ -303,7 +304,7 @@ GlobalTransaction remoteGtx = new GlobalTransaction(); - remoteGtx.setAddress(new DummyAddress()); + remoteGtx.setAddress(EasyMock.createNiceMock(Address.class)); //hack the method call to make it have the remote globalTransaction command.setGlobalTransaction(remoteGtx); @@ -362,7 +363,7 @@ GlobalTransaction remoteGtx = new GlobalTransaction(); - remoteGtx.setAddress(new DummyAddress()); + remoteGtx.setAddress(EasyMock.createNiceMock(Address.class)); //hack the method call to make it have the remote globalTransaction WriteCommand command = entry.getModifications().get(0); command.setGlobalTransaction(remoteGtx); @@ -445,7 +446,7 @@ GlobalTransaction remoteGtx = new GlobalTransaction(); - remoteGtx.setAddress(new DummyAddress()); + remoteGtx.setAddress(EasyMock.createNiceMock(Address.class)); //hack the method call to make it have the remote globalTransaction WriteCommand command = entry.getModifications().get(0); command.setGlobalTransaction(remoteGtx); @@ -533,7 +534,7 @@ GlobalTransaction remoteGtx = new GlobalTransaction(); - remoteGtx.setAddress(new DummyAddress()); + remoteGtx.setAddress(EasyMock.createNiceMock(Address.class)); //hack the method call to make it have the remote globalTransaction WriteCommand command = entry.getModifications().get(0); command.setGlobalTransaction(remoteGtx); @@ -631,7 +632,7 @@ GlobalTransaction remoteGtx = new GlobalTransaction(); - remoteGtx.setAddress(new DummyAddress()); + remoteGtx.setAddress(EasyMock.createNiceMock(Address.class)); // hack the method call to make it have the remote globalTransaction @@ -717,7 +718,7 @@ GlobalTransaction remoteGtx = new GlobalTransaction(); - remoteGtx.setAddress(new DummyAddress()); + remoteGtx.setAddress(EasyMock.createNiceMock(Address.class)); command.setGlobalTransaction(remoteGtx); //call our remote method

15 years, 4 months

1
0
0 / 0

Build failed in Hudson: jboss-cache-core-trunk-jdk1.5 » JBoss Cache - Core Edition #849

by jboss-qa-internal＠redhat.com

See http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-trunk-jdk1.5/org.j... ------------------------------------------

15 years, 4 months

1
0
0 / 0

Build failed in Hudson: jboss-cache-core-trunk-jdk1.6 » JBoss Cache - Core Edition #749

by jboss-qa-internal＠redhat.com

See http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-trunk-jdk1.6/org.j... ------------------------------------------

15 years, 4 months

1
0
0 / 0

JBoss Cache SVN: r8175 - core/trunk.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-08-10 08:17:35 -0400 (Mon, 10 Aug 2009) New Revision: 8175 Modified: core/trunk/pom.xml Log: Testing with JGroups 2.8 Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2009-08-10 11:32:09 UTC (rev 8174) +++ core/trunk/pom.xml 2009-08-10 12:17:35 UTC (rev 8175) @@ -27,8 +27,8 @@ <dependency> <groupId>jgroups</groupId> <artifactId>jgroups</artifactId> -  - <version>2.6.9.GA</version> + <version>2.8.0.Beta2</version> +  </dependency> <!--

15 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbosscache-commits August 2009