[jboss-cvs] JBossAS SVN: r84331 - in projects/ejb3/branches/cluster-dev/cache-jbc2: src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2 and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 17 17:37:42 EST 2009
Author: bstansberry at jboss.com
Date: 2009-02-17 17:37:41 -0500 (Tue, 17 Feb 2009)
New Revision: 84331
Modified:
projects/ejb3/branches/cluster-dev/cache-jbc2/pom.xml
projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/JBCBackingCacheEntryStore.java
projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/JBCBackingCacheEntryStoreSource.java
projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/OwnedItem.java
projects/ejb3/branches/cluster-dev/cache-jbc2/src/test/java/org/jboss/ejb3/test/cache/impl/backing/jbc2/GroupedPassivatingUnitTestCase.java
projects/ejb3/branches/cluster-dev/cache-jbc2/src/test/java/org/jboss/ejb3/test/cache/jbc2/mock/JBC2MockClusterMember.java
projects/ejb3/branches/cluster-dev/cache-jbc2/src/test/resources/test-jbc2-configs.xml
Log:
Sync up with ejb3-core 1.0.0.GA
Modified: projects/ejb3/branches/cluster-dev/cache-jbc2/pom.xml
===================================================================
--- projects/ejb3/branches/cluster-dev/cache-jbc2/pom.xml 2009-02-17 22:37:18 UTC (rev 84330)
+++ projects/ejb3/branches/cluster-dev/cache-jbc2/pom.xml 2009-02-17 22:37:41 UTC (rev 84331)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>1.0.1.CACHE-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -20,14 +20,14 @@
<!-- Artifact Information -->
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-cache-jbc2</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.1.CACHE-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JBoss EJB 3.0 JBoss Cache Integration</name>
<url>http://labs.jboss.com/jbossejb3/</url>
<description>The Java EJB 3.0 JBoss Cache Integration classes</description>
<properties>
- <version.org.jboss.cache_jbosscache-core>2.1.0.GA</version.org.jboss.cache_jbosscache-core>
+ <version.org.jboss.cache_jbosscache-core>3.0.2.GA</version.org.jboss.cache_jbosscache-core>
</properties>
<dependencies>
@@ -36,13 +36,13 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-cache</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.1.CACHE-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-cache</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>1.0.1.CACHE-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Modified: projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/JBCBackingCacheEntryStore.java
===================================================================
--- projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/JBCBackingCacheEntryStore.java 2009-02-17 22:37:18 UTC (rev 84330)
+++ projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/JBCBackingCacheEntryStore.java 2009-02-17 22:37:41 UTC (rev 84331)
@@ -44,7 +44,7 @@
import org.jboss.cache.notifications.event.NodeRemovedEvent;
import org.jboss.cache.notifications.event.NodeVisitedEvent;
import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.cache.api.CacheItem;
+import org.jboss.ejb3.cache.CacheItem;
import org.jboss.ejb3.cache.spi.BackingCacheEntry;
import org.jboss.ejb3.cache.spi.GroupCompatibilityChecker;
import org.jboss.ejb3.cache.spi.SerializationGroup;
@@ -95,7 +95,7 @@
private final String cacheConfigName;
/** The underlying JBC instance */
- private Cache<Object, T> jbc;
+ private Cache<Object, Object> jbc;
/** Qualifier used to scope our Fqns */
private final Object keyBase;
@@ -145,7 +145,7 @@
this.keyBase = name;
this.log = Logger.getLogger(getClass().getName() + "-" + name);
- this.regionRootFqn = new Fqn<Object>(new Object[] { FQN_BASE, this.keyBase });
+ this.regionRootFqn = Fqn.fromElements(new Object[] { FQN_BASE, this.keyBase });
this.inMemoryItems = new ConcurrentHashMap<OwnedItem, OwnedItem>();
this.passivatedItems = new ConcurrentHashMap<OwnedItem, OwnedItem>();
@@ -159,6 +159,7 @@
return jbc.getConfiguration().getCacheMode() != Configuration.CacheMode.LOCAL;
}
+
public T get(Object key)
{
T entry = null;
@@ -170,7 +171,9 @@
{
jbc.getInvocationContext().getOptionOverrides().setForceDataGravitation(true);
}
- entry = (T) jbc.get(id, KEY);
+ @SuppressWarnings("unchecked")
+ T val = (T) jbc.get(id, KEY);
+ entry = val;
}
catch (CacheException e)
{
@@ -335,12 +338,12 @@
super.internalStart();
}
- @SuppressWarnings("unchecked")
+// @SuppressWarnings("unchecked")
private void initializeJBossCache()
{
try
{
- this.jbc = (Cache<Object, T>) cacheManager.getCache(cacheConfigName, true);
+ this.jbc = cacheManager.getCache(cacheConfigName, true);
}
catch (CacheException e)
{
@@ -372,18 +375,18 @@
private void initializeTrackingMaps()
{
// First the main tree
- Node<Object, T> parent = jbc.getNode(regionRootFqn);
+ Node<Object, Object> parent = jbc.getNode(regionRootFqn);
analyzeRegionContent(parent);
// Now any buddy regions
if (usingBuddyRepl)
{
- Node<Object, T> bbRoot = jbc.getNode(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN);
+ Node<Object, Object> bbRoot = jbc.getNode(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN);
if (bbRoot != null)
{
- for (Node<Object, T> bbRegion : bbRoot.getChildren())
+ for (Node<Object, Object> bbRegion : bbRoot.getChildren())
{
- Node<Object, T> ourPart = bbRegion.getChild(regionRootFqn);
+ Node<Object, Object> ourPart = bbRegion.getChild(regionRootFqn);
if (ourPart != null)
{
analyzeRegionContent(ourPart);
@@ -397,19 +400,20 @@
trackVisits = true;
}
- private void analyzeRegionContent(Node<Object, T> parent)
+ private void analyzeRegionContent(Node<Object, Object> parent)
{
for (int i = 0; i < hashBuckets.length; i++)
{
- Node<Object, T> bucket = parent.getChild(hashBuckets[i]);
+ Node<Object, Object> bucket = parent.getChild(hashBuckets[i]);
if (bucket == null)
continue;
Set<Object> childrenNames = bucket.getChildrenNames();
for (Object name : childrenNames)
{
- Node<Object, T> child = bucket.getChild(name);
+ Node<Object, Object> child = bucket.getChild(name);
if (child == null)
continue;
+ @SuppressWarnings("unchecked")
T entry = (T) child.get(KEY);
if (entry != null)
{
@@ -574,16 +578,16 @@
int index = getIndexForId(id, beanId);
if (regionRelative)
- return new Fqn<Object>( new Object[] {hashBuckets[index], beanId} );
+ return Fqn.fromElements( new Object[] {hashBuckets[index], beanId} );
else
- return new Fqn<Object>(regionRootFqn, hashBuckets[index], beanId);
+ return Fqn.fromRelativeElements(regionRootFqn, hashBuckets[index], beanId);
}
private Fqn<Object> getBuddyFqn(Object id, Object owner)
{
assert owner != null : "owner cannot be null for a buddy backup Fqn";
- return new Fqn<Object>(new Object[] { BuddyManager.BUDDY_BACKUP_SUBTREE, owner, FQN_BASE, keyBase, id});
+ return Fqn.fromElements(new Object[] { BuddyManager.BUDDY_BACKUP_SUBTREE, owner, FQN_BASE, keyBase, id});
}
private int getIndexForId(Object id, String stringForm)
Modified: projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/JBCBackingCacheEntryStoreSource.java
===================================================================
--- projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/JBCBackingCacheEntryStoreSource.java 2009-02-17 22:37:18 UTC (rev 84330)
+++ projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/JBCBackingCacheEntryStoreSource.java 2009-02-17 22:37:41 UTC (rev 84331)
@@ -26,7 +26,7 @@
import org.jboss.cache.CacheManager;
import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.cache.api.CacheItem;
+import org.jboss.ejb3.cache.CacheItem;
import org.jboss.ejb3.cache.spi.BackingCacheEntryStore;
import org.jboss.ejb3.cache.spi.BackingCacheEntryStoreSource;
import org.jboss.ejb3.cache.spi.SerializationGroup;
Modified: projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/OwnedItem.java
===================================================================
--- projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/OwnedItem.java 2009-02-17 22:37:18 UTC (rev 84330)
+++ projects/ejb3/branches/cluster-dev/cache-jbc2/src/main/java/org/jboss/ejb3/cache/impl/backing/jbc2/OwnedItem.java 2009-02-17 22:37:41 UTC (rev 84331)
@@ -24,7 +24,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.buddyreplication.BuddyManager;
-import org.jboss.ejb3.cache.api.CacheItem;
+import org.jboss.ejb3.cache.CacheItem;
/**
* Encapsulates the identifier for a {@link CacheItem} as well as information
Modified: projects/ejb3/branches/cluster-dev/cache-jbc2/src/test/java/org/jboss/ejb3/test/cache/impl/backing/jbc2/GroupedPassivatingUnitTestCase.java
===================================================================
--- projects/ejb3/branches/cluster-dev/cache-jbc2/src/test/java/org/jboss/ejb3/test/cache/impl/backing/jbc2/GroupedPassivatingUnitTestCase.java 2009-02-17 22:37:18 UTC (rev 84330)
+++ projects/ejb3/branches/cluster-dev/cache-jbc2/src/test/java/org/jboss/ejb3/test/cache/impl/backing/jbc2/GroupedPassivatingUnitTestCase.java 2009-02-17 22:37:41 UTC (rev 84331)
@@ -82,8 +82,8 @@
assertNotNull(ctx1.getXPC());
assertEquals(ctx1.getXPC(), ctx2.getXPC());
- container2.getCache().finished(ctx2);
- container1.getCache().finished(ctx1);
+ container2.getCache().release(ctx2);
+ container1.getCache().release(ctx1);
if (transactional)
{
@@ -124,8 +124,8 @@
assertNotNull(ctx1.getXPC());
assertSame(ctx1.getXPC(), ctx2.getXPC());
- container1.getCache().finished(ctx1);
- container2.getCache().finished(ctx2);
+ container1.getCache().release(ctx1);
+ container2.getCache().release(ctx2);
if (transactional)
{
@@ -196,8 +196,8 @@
entityA = ctx2A.createEntity();
assertSame(entityA, ctx1A.getEntity());
- container2A.getCache().finished(ctx2A);
- container1A.getCache().finished(ctx1A);
+ container2A.getCache().release(ctx2A);
+ container1A.getCache().release(ctx1A);
if (transactional)
{
@@ -237,8 +237,8 @@
MockEntity entity1x = ctx1A.getEntity();
assertEquals(entityA, entity1x);
- container1A.getCache().finished(ctx1A);
- container2A.getCache().finished(ctx2A);
+ container1A.getCache().release(ctx1A);
+ container2A.getCache().release(ctx2A);
if (transactional)
{
@@ -276,8 +276,8 @@
assertEquals(entityA, entityB);
assertNotSame(entityA, entityB);
- container2B.getCache().finished(ctx2B);
- container1B.getCache().finished(ctx1B);
+ container2B.getCache().release(ctx2B);
+ container1B.getCache().release(ctx1B);
if (transactional)
{
Modified: projects/ejb3/branches/cluster-dev/cache-jbc2/src/test/java/org/jboss/ejb3/test/cache/jbc2/mock/JBC2MockClusterMember.java
===================================================================
--- projects/ejb3/branches/cluster-dev/cache-jbc2/src/test/java/org/jboss/ejb3/test/cache/jbc2/mock/JBC2MockClusterMember.java 2009-02-17 22:37:18 UTC (rev 84330)
+++ projects/ejb3/branches/cluster-dev/cache-jbc2/src/test/java/org/jboss/ejb3/test/cache/jbc2/mock/JBC2MockClusterMember.java 2009-02-17 22:37:41 UTC (rev 84331)
@@ -28,10 +28,10 @@
import javax.transaction.TransactionManager;
import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.cache.api.CacheFactoryNotRegisteredException;
import org.jboss.ejb3.cache.impl.backing.jbc2.JBCBackingCacheEntryStoreSource;
import org.jboss.ejb3.cache.spi.BackingCacheEntryStoreSource;
import org.jboss.ejb3.cache.spi.impl.AbstractStatefulCacheFactory;
+import org.jboss.ejb3.test.cache.mock.CacheFactoryNotRegisteredException;
import org.jboss.ejb3.test.cache.mock.CacheType;
import org.jboss.ejb3.test.cache.mock.MockBeanContainer;
import org.jboss.ejb3.test.cache.mock.MockBeanContext;
Modified: projects/ejb3/branches/cluster-dev/cache-jbc2/src/test/resources/test-jbc2-configs.xml
===================================================================
--- projects/ejb3/branches/cluster-dev/cache-jbc2/src/test/resources/test-jbc2-configs.xml 2009-02-17 22:37:18 UTC (rev 84330)
+++ projects/ejb3/branches/cluster-dev/cache-jbc2/src/test/resources/test-jbc2-configs.xml 2009-02-17 22:37:41 UTC (rev 84331)
@@ -128,7 +128,7 @@
<class>org.jboss.cache.loader.FileCacheLoader</class>
<!-- Passivate to the server data dir -->
<properties>
- location=${jboss.server.data.dir}${/}sfsb
+ location=${java.io.tmpdir}${/}sfsb
</properties>
<async>false</async>
<fetchPersistentState>true</fetchPersistentState>
@@ -239,7 +239,7 @@
<class>org.jboss.cache.loader.FileCacheLoader</class>
<!-- Passivate to the server data dir -->
<properties>
- location=${jboss.server.data.dir}${/}sfsb
+ location=${java.io.tmpdir}${/}sfsb
</properties>
<async>false</async>
<fetchPersistentState>true</fetchPersistentState>
More information about the jboss-cvs-commits
mailing list