[jboss-cvs] JBossAS SVN: r70873 - in projects/ejb3/branches/cluster-dev/ejb3-cache/src: main/java/org/jboss/ejb3/cache/api and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 14 11:19:15 EDT 2008
Author: bstansberry at jboss.com
Date: 2008-03-14 11:19:15 -0400 (Fri, 14 Mar 2008)
New Revision: 70873
Added:
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/Cache.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/CacheFactoryNotRegisteredException.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/CacheItem.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/Identifiable.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/PassivationManager.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/StatefulCacheFactory.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/StatefulCacheFactoryRegistry.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/StatefulObjectFactory.java
Removed:
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/Cache.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/CacheFactoryNotRegisteredException.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/CacheItem.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/Identifiable.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/PassivationManager.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/StatefulCacheFactory.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/StatefulCacheFactoryRegistry.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/StatefulObjectFactory.java
Modified:
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/GroupAwareTransactionalCache.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/TransactionalCache.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/GroupAwareBackingCacheImpl.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/NonPassivatingBackingCacheEntry.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/NonPassivatingBackingCacheImpl.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/PassivatingBackingCacheImpl.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupContainer.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupImpl.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupMemberContainer.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupMemberImpl.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SimplePassivatingIntegratedObjectStore.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/factory/GroupAwareCacheFactory.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/factory/NonClusteredIntegratedObjectStoreSource.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/factory/NonPassivatingCacheFactory.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/BackingCache.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/BackingCacheEntry.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/GroupAwareBackingCache.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/IntegratedObjectStore.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/IntegratedObjectStoreSource.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/ObjectStore.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/PassivatingBackingCache.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/PassivatingIntegratedObjectStore.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/SerializationGroup.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/SerializationGroupMember.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/AbstractBackingCacheEntry.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/AbstractPassivatingIntegratedObjectStore.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/AbstractStatefulCacheFactory.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/CacheableTimestamp.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/FileObjectStore.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/ItemCachePair.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/distributed/MockIntegratedObjectStoreSource.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/distributed/MockJBCIntegratedObjectStore.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/integrated/GroupAwareTransactionalCacheUnitTestCase.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/integrated/TransactionalCacheUnitTestCase.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockBeanContainer.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockCacheItem.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockEjb3System.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockIdentifiable.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockPassivationManager.java
projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockStatefulObjectFactory.java
Log:
[EJBTHREE-1026] Move API classes to an api package
Deleted: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/Cache.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/Cache.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/Cache.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -1,99 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.cache;
-
-import javax.ejb.NoSuchEJBException;
-
-
-/**
- * Cache a stateful object and make sure any life cycle callbacks are
- * called at the appropriate time.
- *
- * A cache is linked to an object factory. How the link is established is left beyond
- * scope.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @author Brian Stansberry
- *
- * @version $Revision: $
- */
-public interface Cache<T extends CacheItem>
-{
- /**
- * Creates and caches a new instance of <code>T</code>. The new
- * <code>T</code> *is* returned, but is not regarded as being "in use".
- * Callers *must not* attempt to use the new <code>T</code> without
- * first calling {@link #get(Object)}.
- *
- * @param initTypes the types of any <code>initValues</code>.
- * May be <code>null</code>.
- * @param initValues any paramaters to pass to <code>T</code>'s constructor.
- * May be null, in which case a default constructor will
- * be used.
- * @return the new <code>T</code>
- */
- Object create(Class<?> initTypes[], Object initValues[]);
-
- /**
- * Get the specified object from cache. This will mark
- * the object as being in use.
- *
- * @param key the identifier of the object
- * @return the object
- * @throws NoSuchEJBException if the object does not exist
- * @throws IllegalStateException if the object is already in use by another
- * transaction or if {@link #finished(CacheItem)}
- * has not been invoked since the last time
- * the object was gotten.
- */
- T get(Object key) throws NoSuchEJBException;
-
- /**
- * Signal the finish of the current operation on the object.
- * If the object was {@link #get(Object) gotten from the cache} in the
- * course of an ongoing transaction, the object will still be regarded as in
- * use, but <code>get()</code> can safely be invoked again by that same
- * transaction. If there was no transaction in effect when the object was
- * gotten from the cache, invoking this method marks the object as no
- * longer being in use.
- *
- * @param obj object previously gotten via {@link #get(Object)}
- */
- void finished(T obj);
-
- /**
- * Remove the specified object from cache.
- *
- * @param key the identifier of the object
- */
- void remove(Object key);
-
- /**
- * Start the cache.
- */
- void start();
-
- /**
- * Stop the cache.
- */
- void stop();
-}
Deleted: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/CacheFactoryNotRegisteredException.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/CacheFactoryNotRegisteredException.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/CacheFactoryNotRegisteredException.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.cache;
-
-/**
- * Thrown when attempting to retrieve a cache factory with an
- * unrecognized name from the {@link StatefulCacheFactoryRegistry}.
- *
- * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
- * @version $Revision: $
- */
-public class CacheFactoryNotRegisteredException extends Exception
-{
-
- // Class Members
- private static final long serialVersionUID = -881723607135494483L;
-
- // Constructors
-
- public CacheFactoryNotRegisteredException()
- {
- super();
- }
-
- public CacheFactoryNotRegisteredException(String message)
- {
- super(message);
- }
-
-}
Deleted: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/CacheItem.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/CacheItem.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/CacheItem.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.ejb3.cache;
-
-import java.io.Serializable;
-
-/**
- * An item that can be stored in a {@link Cache}.
- *
- * @author Brian Stansberry
- * @version $Revision$
- */
-public interface CacheItem extends Identifiable, Serializable
-{
- /**
- * Gets whether this object's internal state has been modified since
- * the last request to this method.
- * <p>
- * Implementations must be aggressive about returning <code>true</code> if
- * they are uncertain about whether they have been modified; <code>false</code>
- * should only be returned if the implementing object is certain its
- * internal state has not been modified.
- * </p>
- *
- * @return <code>true</code> if the state has been modified or the
- * implementing object does not know; <code>false</code> otherwise.
- */
- boolean isModified();
-}
Deleted: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/Identifiable.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/Identifiable.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/Identifiable.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.cache;
-
-/**
- * An object that has an identification. How the object obtains
- * it's identification is left beyond scope. Could be via construction
- * or via a setter.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface Identifiable
-{
- /**
- * The object identifier.
- * @return the object identifier
- */
- Object getId();
-}
Deleted: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/PassivationManager.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/PassivationManager.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/PassivationManager.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.cache;
-
-import java.io.Serializable;
-
-/**
- * Manages passivation and replication lifecycle callbacks on an object.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
-public interface PassivationManager<T extends CacheItem & Serializable>
-{
- /**
- * This method is called after an object has been retrieved
- * from an ObjectStore.
- *
- * @param obj the object
- */
- void postActivate(T obj);
-
- /**
- * This method is called before an object is serialized into an
- * ObjectStore.
- *
- * @param obj the object
- *
- * @throws IllegalStateException if <code>obj</code>, or another object in the
- * same serialization group as <code>obj</code>,
- * is in use. Checking if an object is in use and
- * throwing this exception is not required, so
- * callers should not assume it will be thrown.
- */
- void prePassivate(T obj);
-
- /**
- * This method is called after a previously replicated object has been
- * retrieved from a clustered cache.
- *
- * @param obj the object.
- */
- void postReplicate(T obj);
-
- /**
- * This method is called before an object is replicated by a clustered
- * cache.
- *
- * @param obj the object
- *
- * @throws IllegalStateException if <code>obj</code>, or another object in the
- * same serialization group as <code>obj</code>,
- * is in use. Checking if an object is in use and
- * throwing this exception is not required, so
- * callers should not assume it will be thrown.
- */
- void preReplicate(T obj);
-}
Deleted: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/StatefulCacheFactory.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/StatefulCacheFactory.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/StatefulCacheFactory.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.cache;
-
-import org.jboss.ejb3.annotation.CacheConfig;
-
-/**
- * Defines the contract for an EJB3 Stateful Cache Factory
- *
- * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
- * @author Brian Stansberry
- *
- * @version $Revision: $
- */
-public interface StatefulCacheFactory<T extends CacheItem>
-{
- /**
- * Creates a cache for a container.
- *
- * @param containerName fully qualified name of the container. Must be
- * unique across all possibly co-existent containers
- * in the system. Should be as concise as possible,
- * as this name may be replicated around a cluster
- * in numerous messages. Should not contain characters
- * that are illegal to include in an element of a
- * filesystem path. An example containerName
- * for an EJBContainer might be
- * "ear=foo.ear,jar=foo.jar,name=Bar".
- * @param factory factory for creating objects managed by the cache
- * @param passivationManager manager for invoking pre and post passivation
- * and replication callbacks on the cached objects
- * @param config configuration details for the cache
- *
- * @return the cache
- */
- Cache<T> createCache(String containerName,
- StatefulObjectFactory<T> factory,
- PassivationManager<T> passivationManager,
- CacheConfig config);
-}
Deleted: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/StatefulCacheFactoryRegistry.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/StatefulCacheFactoryRegistry.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/StatefulCacheFactoryRegistry.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.cache;
-
-import java.util.Map;
-
-/**
- * Registry for all configured Stateful Cache Factory implementations
- *
- * TODO Does this belong in ejb3-core? That would allow all of the
- * StatefulCacheFactory<T extends CacheItem> usage to be replaced with
- * StatefulCacheFactory<StatefulBeanContext> without leaking the
- * StatefulBeanContext class to ejb3-cache.
- *
- * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
- * @author Brian Stansberry
- *
- * @version $Revision: $
- */
-public class StatefulCacheFactoryRegistry<T extends CacheItem>
-{
- // Instance Members
- private Map<String, StatefulCacheFactory<T>> factories;
-
- // Accessors / Mutators
-
- public Map<String, StatefulCacheFactory<T>> getFactories()
- {
- return factories;
- }
-
- public void setFactories(Map<String, StatefulCacheFactory<T>> factories)
- {
- this.factories = factories;
- }
-
- public void addCacheFactory(String name, StatefulCacheFactory<T> factory)
- {
- this.factories.put(name, factory);
- }
-
- public void removeCacheFactory(String name)
- {
- this.factories.remove(name);
- }
-
- // Functional Methods
-
- /**
- * Obtains the Cache Factory with the specified registered name
- *
- * @param name The registered name of the cache factory to retrieve
- * @return The Cache Factory
- */
- public StatefulCacheFactory<T> getCacheFactory(String name) throws CacheFactoryNotRegisteredException
- {
- // Obtain cache factory
- StatefulCacheFactory<T> cacheFactory = this.factories.get(name);
-
- // Ensure registered
- if (cacheFactory == null)
- {
- throw new CacheFactoryNotRegisteredException("Cache Factory with name " + name + " is not registered.");
- }
-
- return cacheFactory;
- }
-}
Deleted: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/StatefulObjectFactory.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/StatefulObjectFactory.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/StatefulObjectFactory.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.cache;
-
-import java.util.Map;
-
-/**
- * Creates and destroys stateful objects.
- *
- * The object returned by create has dependencies injected. The PostConstruct
- * callback, if defined, has been called and the Init callback, if defined,
- * has been called.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface StatefulObjectFactory<T extends CacheItem>
-{
- /**
- * Creates a new stateful object by calling it's empty constructor,
- * do injection, calling post-construct and finally calling the
- * appropriate init method.
- *
- * @param initTypes the argument types for the init method
- * @param initValues the arguments for the init method
- * @param sharedState map into which any objects meant to be shared with
- * other members of the new items group should be
- * stored.
- *
- * @return the new item
- */
- T create(Class<?> initTypes[], Object initValues[], Map<Object, Object> sharedState);
-
- /**
- * Perform any cleanup actions on the object, such as
- * calling the pre-destroy callback.
- *
- * @param obj the object
- */
- void destroy(T obj);
-}
Copied: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/Cache.java (from rev 70871, projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/Cache.java)
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/Cache.java (rev 0)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/Cache.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -0,0 +1,99 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.cache.api;
+
+import javax.ejb.NoSuchEJBException;
+
+
+/**
+ * Cache a stateful object and make sure any life cycle callbacks are
+ * called at the appropriate time.
+ *
+ * A cache is linked to an object factory. How the link is established is left beyond
+ * scope.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @author Brian Stansberry
+ *
+ * @version $Revision: $
+ */
+public interface Cache<T extends CacheItem>
+{
+ /**
+ * Creates and caches a new instance of <code>T</code>. The new
+ * <code>T</code> *is* returned, but is not regarded as being "in use".
+ * Callers *must not* attempt to use the new <code>T</code> without
+ * first calling {@link #get(Object)}.
+ *
+ * @param initTypes the types of any <code>initValues</code>.
+ * May be <code>null</code>.
+ * @param initValues any paramaters to pass to <code>T</code>'s constructor.
+ * May be null, in which case a default constructor will
+ * be used.
+ * @return the new <code>T</code>
+ */
+ Object create(Class<?> initTypes[], Object initValues[]);
+
+ /**
+ * Get the specified object from cache. This will mark
+ * the object as being in use.
+ *
+ * @param key the identifier of the object
+ * @return the object
+ * @throws NoSuchEJBException if the object does not exist
+ * @throws IllegalStateException if the object is already in use by another
+ * transaction or if {@link #finished(CacheItem)}
+ * has not been invoked since the last time
+ * the object was gotten.
+ */
+ T get(Object key) throws NoSuchEJBException;
+
+ /**
+ * Signal the finish of the current operation on the object.
+ * If the object was {@link #get(Object) gotten from the cache} in the
+ * course of an ongoing transaction, the object will still be regarded as in
+ * use, but <code>get()</code> can safely be invoked again by that same
+ * transaction. If there was no transaction in effect when the object was
+ * gotten from the cache, invoking this method marks the object as no
+ * longer being in use.
+ *
+ * @param obj object previously gotten via {@link #get(Object)}
+ */
+ void finished(T obj);
+
+ /**
+ * Remove the specified object from cache.
+ *
+ * @param key the identifier of the object
+ */
+ void remove(Object key);
+
+ /**
+ * Start the cache.
+ */
+ void start();
+
+ /**
+ * Stop the cache.
+ */
+ void stop();
+}
Copied: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/CacheFactoryNotRegisteredException.java (from rev 70871, projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/CacheFactoryNotRegisteredException.java)
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/CacheFactoryNotRegisteredException.java (rev 0)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/CacheFactoryNotRegisteredException.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.cache.api;
+
+/**
+ * Thrown when attempting to retrieve a cache factory with an
+ * unrecognized name from the {@link StatefulCacheFactoryRegistry}.
+ *
+ * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
+ * @version $Revision: $
+ */
+public class CacheFactoryNotRegisteredException extends Exception
+{
+
+ // Class Members
+ private static final long serialVersionUID = -881723607135494483L;
+
+ // Constructors
+
+ public CacheFactoryNotRegisteredException()
+ {
+ super();
+ }
+
+ public CacheFactoryNotRegisteredException(String message)
+ {
+ super(message);
+ }
+
+}
Copied: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/CacheItem.java (from rev 70871, projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/CacheItem.java)
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/CacheItem.java (rev 0)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/CacheItem.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.cache.api;
+
+import java.io.Serializable;
+
+/**
+ * An item that can be stored in a {@link Cache}.
+ *
+ * @author Brian Stansberry
+ * @version $Revision$
+ */
+public interface CacheItem extends Identifiable, Serializable
+{
+ /**
+ * Gets whether this object's internal state has been modified since
+ * the last request to this method.
+ * <p>
+ * Implementations must be aggressive about returning <code>true</code> if
+ * they are uncertain about whether they have been modified; <code>false</code>
+ * should only be returned if the implementing object is certain its
+ * internal state has not been modified.
+ * </p>
+ *
+ * @return <code>true</code> if the state has been modified or the
+ * implementing object does not know; <code>false</code> otherwise.
+ */
+ boolean isModified();
+}
Copied: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/Identifiable.java (from rev 70871, projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/Identifiable.java)
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/Identifiable.java (rev 0)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/Identifiable.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.cache.api;
+
+/**
+ * An object that has an identification. How the object obtains
+ * it's identification is left beyond scope. Could be via construction
+ * or via a setter.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface Identifiable
+{
+ /**
+ * The object identifier.
+ * @return the object identifier
+ */
+ Object getId();
+}
Copied: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/PassivationManager.java (from rev 70871, projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/PassivationManager.java)
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/PassivationManager.java (rev 0)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/PassivationManager.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.cache.api;
+
+import java.io.Serializable;
+
+/**
+ * Manages passivation and replication lifecycle callbacks on an object.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public interface PassivationManager<T extends CacheItem & Serializable>
+{
+ /**
+ * This method is called after an object has been retrieved
+ * from an ObjectStore.
+ *
+ * @param obj the object
+ */
+ void postActivate(T obj);
+
+ /**
+ * This method is called before an object is serialized into an
+ * ObjectStore.
+ *
+ * @param obj the object
+ *
+ * @throws IllegalStateException if <code>obj</code>, or another object in the
+ * same serialization group as <code>obj</code>,
+ * is in use. Checking if an object is in use and
+ * throwing this exception is not required, so
+ * callers should not assume it will be thrown.
+ */
+ void prePassivate(T obj);
+
+ /**
+ * This method is called after a previously replicated object has been
+ * retrieved from a clustered cache.
+ *
+ * @param obj the object.
+ */
+ void postReplicate(T obj);
+
+ /**
+ * This method is called before an object is replicated by a clustered
+ * cache.
+ *
+ * @param obj the object
+ *
+ * @throws IllegalStateException if <code>obj</code>, or another object in the
+ * same serialization group as <code>obj</code>,
+ * is in use. Checking if an object is in use and
+ * throwing this exception is not required, so
+ * callers should not assume it will be thrown.
+ */
+ void preReplicate(T obj);
+}
Copied: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/StatefulCacheFactory.java (from rev 70871, projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/StatefulCacheFactory.java)
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/StatefulCacheFactory.java (rev 0)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/StatefulCacheFactory.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.cache.api;
+
+import org.jboss.ejb3.annotation.CacheConfig;
+
+/**
+ * Defines the contract for an EJB3 Stateful Cache Factory
+ *
+ * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
+ * @author Brian Stansberry
+ *
+ * @version $Revision: $
+ */
+public interface StatefulCacheFactory<T extends CacheItem>
+{
+ /**
+ * Creates a cache for a container.
+ *
+ * @param containerName fully qualified name of the container. Must be
+ * unique across all possibly co-existent containers
+ * in the system. Should be as concise as possible,
+ * as this name may be replicated around a cluster
+ * in numerous messages. Should not contain characters
+ * that are illegal to include in an element of a
+ * filesystem path. An example containerName
+ * for an EJBContainer might be
+ * "ear=foo.ear,jar=foo.jar,name=Bar".
+ * @param factory factory for creating objects managed by the cache
+ * @param passivationManager manager for invoking pre and post passivation
+ * and replication callbacks on the cached objects
+ * @param config configuration details for the cache
+ *
+ * @return the cache
+ */
+ Cache<T> createCache(String containerName,
+ StatefulObjectFactory<T> factory,
+ PassivationManager<T> passivationManager,
+ CacheConfig config);
+}
Copied: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/StatefulCacheFactoryRegistry.java (from rev 70871, projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/StatefulCacheFactoryRegistry.java)
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/StatefulCacheFactoryRegistry.java (rev 0)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/StatefulCacheFactoryRegistry.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.cache.api;
+
+import java.util.Map;
+
+/**
+ * Registry for all configured Stateful Cache Factory implementations
+ *
+ * TODO Does this belong in ejb3-core? That would allow all of the
+ * StatefulCacheFactory<T extends CacheItem> usage to be replaced with
+ * StatefulCacheFactory<StatefulBeanContext> without leaking the
+ * StatefulBeanContext class to ejb3-cache.
+ *
+ * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
+ * @author Brian Stansberry
+ *
+ * @version $Revision: $
+ */
+public class StatefulCacheFactoryRegistry<T extends CacheItem>
+{
+ // Instance Members
+ private Map<String, StatefulCacheFactory<T>> factories;
+
+ // Accessors / Mutators
+
+ public Map<String, StatefulCacheFactory<T>> getFactories()
+ {
+ return factories;
+ }
+
+ public void setFactories(Map<String, StatefulCacheFactory<T>> factories)
+ {
+ this.factories = factories;
+ }
+
+ public void addCacheFactory(String name, StatefulCacheFactory<T> factory)
+ {
+ this.factories.put(name, factory);
+ }
+
+ public void removeCacheFactory(String name)
+ {
+ this.factories.remove(name);
+ }
+
+ // Functional Methods
+
+ /**
+ * Obtains the Cache Factory with the specified registered name
+ *
+ * @param name The registered name of the cache factory to retrieve
+ * @return The Cache Factory
+ */
+ public StatefulCacheFactory<T> getCacheFactory(String name) throws CacheFactoryNotRegisteredException
+ {
+ // Obtain cache factory
+ StatefulCacheFactory<T> cacheFactory = this.factories.get(name);
+
+ // Ensure registered
+ if (cacheFactory == null)
+ {
+ throw new CacheFactoryNotRegisteredException("Cache Factory with name " + name + " is not registered.");
+ }
+
+ return cacheFactory;
+ }
+}
Copied: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/StatefulObjectFactory.java (from rev 70871, projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/StatefulObjectFactory.java)
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/StatefulObjectFactory.java (rev 0)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/api/StatefulObjectFactory.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.cache.api;
+
+import java.util.Map;
+
+/**
+ * Creates and destroys stateful objects.
+ *
+ * The object returned by create has dependencies injected. The PostConstruct
+ * callback, if defined, has been called and the Init callback, if defined,
+ * has been called.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface StatefulObjectFactory<T extends CacheItem>
+{
+ /**
+ * Creates a new stateful object by calling it's empty constructor,
+ * do injection, calling post-construct and finally calling the
+ * appropriate init method.
+ *
+ * @param initTypes the argument types for the init method
+ * @param initValues the arguments for the init method
+ * @param sharedState map into which any objects meant to be shared with
+ * other members of the new items group should be
+ * stored.
+ *
+ * @return the new item
+ */
+ T create(Class<?> initTypes[], Object initValues[], Map<Object, Object> sharedState);
+
+ /**
+ * Perform any cleanup actions on the object, such as
+ * calling the pre-destroy callback.
+ *
+ * @param obj the object
+ */
+ void destroy(T obj);
+}
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/GroupAwareTransactionalCache.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/GroupAwareTransactionalCache.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/GroupAwareTransactionalCache.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -28,8 +28,8 @@
import javax.transaction.TransactionManager;
-import org.jboss.ejb3.cache.Cache;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.Cache;
+import org.jboss.ejb3.cache.api.CacheItem;
import org.jboss.ejb3.cache.spi.BackingCacheEntry;
import org.jboss.ejb3.cache.spi.GroupAwareBackingCache;
import org.jboss.ejb3.cache.spi.SerializationGroup;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/TransactionalCache.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/TransactionalCache.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/TransactionalCache.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -33,8 +33,8 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import org.jboss.ejb3.cache.Cache;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.Cache;
+import org.jboss.ejb3.cache.api.CacheItem;
import org.jboss.ejb3.cache.spi.BackingCache;
import org.jboss.ejb3.cache.spi.BackingCacheEntry;
import org.jboss.ejb3.cache.spi.IntegratedObjectStore;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/GroupAwareBackingCacheImpl.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/GroupAwareBackingCacheImpl.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/GroupAwareBackingCacheImpl.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -23,7 +23,7 @@
import javax.ejb.NoSuchEJBException;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
import org.jboss.ejb3.cache.spi.GroupAwareBackingCache;
import org.jboss.ejb3.cache.spi.PassivatingBackingCache;
import org.jboss.ejb3.cache.spi.SerializationGroup;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/NonPassivatingBackingCacheEntry.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/NonPassivatingBackingCacheEntry.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/NonPassivatingBackingCacheEntry.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -23,7 +23,7 @@
import java.io.Serializable;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
import org.jboss.ejb3.cache.spi.BackingCacheEntry;
import org.jboss.ejb3.cache.spi.impl.AbstractBackingCacheEntry;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/NonPassivatingBackingCacheImpl.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/NonPassivatingBackingCacheImpl.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/NonPassivatingBackingCacheImpl.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -28,8 +28,8 @@
import javax.ejb.NoSuchEJBException;
-import org.jboss.ejb3.cache.CacheItem;
-import org.jboss.ejb3.cache.StatefulObjectFactory;
+import org.jboss.ejb3.cache.api.CacheItem;
+import org.jboss.ejb3.cache.api.StatefulObjectFactory;
import org.jboss.ejb3.cache.spi.BackingCache;
import org.jboss.ejb3.cache.spi.PassivationExpirationProcessor;
import org.jboss.ejb3.cache.spi.impl.PassivationExpirationRunner;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/PassivatingBackingCacheImpl.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/PassivatingBackingCacheImpl.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/PassivatingBackingCacheImpl.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -25,9 +25,9 @@
import javax.ejb.NoSuchEJBException;
-import org.jboss.ejb3.cache.CacheItem;
-import org.jboss.ejb3.cache.PassivationManager;
-import org.jboss.ejb3.cache.StatefulObjectFactory;
+import org.jboss.ejb3.cache.api.CacheItem;
+import org.jboss.ejb3.cache.api.PassivationManager;
+import org.jboss.ejb3.cache.api.StatefulObjectFactory;
import org.jboss.ejb3.cache.spi.BackingCacheEntry;
import org.jboss.ejb3.cache.spi.PassivatingBackingCache;
import org.jboss.ejb3.cache.spi.PassivatingIntegratedObjectStore;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupContainer.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupContainer.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupContainer.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -23,9 +23,9 @@
import java.util.Map;
-import org.jboss.ejb3.cache.CacheItem;
-import org.jboss.ejb3.cache.PassivationManager;
-import org.jboss.ejb3.cache.StatefulObjectFactory;
+import org.jboss.ejb3.cache.api.CacheItem;
+import org.jboss.ejb3.cache.api.PassivationManager;
+import org.jboss.ejb3.cache.api.StatefulObjectFactory;
import org.jboss.ejb3.cache.spi.PassivatingBackingCache;
import org.jboss.ejb3.cache.spi.SerializationGroup;
import org.jboss.logging.Logger;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupImpl.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupImpl.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupImpl.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -28,8 +28,8 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import org.jboss.ejb3.cache.CacheItem;
-import org.jboss.ejb3.cache.Identifiable;
+import org.jboss.ejb3.cache.api.CacheItem;
+import org.jboss.ejb3.cache.api.Identifiable;
import org.jboss.ejb3.cache.spi.BackingCacheEntry;
import org.jboss.ejb3.cache.spi.PassivatingBackingCache;
import org.jboss.ejb3.cache.spi.SerializationGroup;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupMemberContainer.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupMemberContainer.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupMemberContainer.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -24,9 +24,9 @@
import java.util.Map;
-import org.jboss.ejb3.cache.CacheItem;
-import org.jboss.ejb3.cache.PassivationManager;
-import org.jboss.ejb3.cache.StatefulObjectFactory;
+import org.jboss.ejb3.cache.api.CacheItem;
+import org.jboss.ejb3.cache.api.PassivationManager;
+import org.jboss.ejb3.cache.api.StatefulObjectFactory;
import org.jboss.ejb3.cache.spi.PassivatingBackingCache;
import org.jboss.ejb3.cache.spi.PassivatingIntegratedObjectStore;
import org.jboss.ejb3.cache.spi.SerializationGroup;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupMemberImpl.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupMemberImpl.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SerializationGroupMemberImpl.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -24,7 +24,7 @@
import java.io.IOException;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
import org.jboss.ejb3.cache.spi.PassivatingBackingCache;
import org.jboss.ejb3.cache.spi.SerializationGroup;
import org.jboss.ejb3.cache.spi.SerializationGroupMember;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SimplePassivatingIntegratedObjectStore.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SimplePassivatingIntegratedObjectStore.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/backing/SimplePassivatingIntegratedObjectStore.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -28,7 +28,7 @@
import java.util.TreeSet;
import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
import org.jboss.ejb3.cache.spi.BackingCacheEntry;
import org.jboss.ejb3.cache.spi.ObjectStore;
import org.jboss.ejb3.cache.spi.PassivatingIntegratedObjectStore;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/factory/GroupAwareCacheFactory.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/factory/GroupAwareCacheFactory.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/factory/GroupAwareCacheFactory.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -26,11 +26,11 @@
import java.util.Map;
import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.cache.Cache;
-import org.jboss.ejb3.cache.CacheItem;
-import org.jboss.ejb3.cache.PassivationManager;
-import org.jboss.ejb3.cache.StatefulCacheFactory;
-import org.jboss.ejb3.cache.StatefulObjectFactory;
+import org.jboss.ejb3.cache.api.Cache;
+import org.jboss.ejb3.cache.api.CacheItem;
+import org.jboss.ejb3.cache.api.PassivationManager;
+import org.jboss.ejb3.cache.api.StatefulCacheFactory;
+import org.jboss.ejb3.cache.api.StatefulObjectFactory;
import org.jboss.ejb3.cache.impl.GroupAwareTransactionalCache;
import org.jboss.ejb3.cache.impl.backing.GroupAwareBackingCacheImpl;
import org.jboss.ejb3.cache.impl.backing.PassivatingBackingCacheImpl;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/factory/NonClusteredIntegratedObjectStoreSource.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/factory/NonClusteredIntegratedObjectStoreSource.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/factory/NonClusteredIntegratedObjectStoreSource.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -27,7 +27,7 @@
import javax.transaction.TransactionManager;
import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
import org.jboss.ejb3.cache.impl.backing.SimplePassivatingIntegratedObjectStore;
import org.jboss.ejb3.cache.spi.IntegratedObjectStoreSource;
import org.jboss.ejb3.cache.spi.PassivatingIntegratedObjectStore;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/factory/NonPassivatingCacheFactory.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/factory/NonPassivatingCacheFactory.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/impl/factory/NonPassivatingCacheFactory.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -23,11 +23,11 @@
package org.jboss.ejb3.cache.impl.factory;
import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.cache.Cache;
-import org.jboss.ejb3.cache.CacheItem;
-import org.jboss.ejb3.cache.PassivationManager;
-import org.jboss.ejb3.cache.StatefulCacheFactory;
-import org.jboss.ejb3.cache.StatefulObjectFactory;
+import org.jboss.ejb3.cache.api.Cache;
+import org.jboss.ejb3.cache.api.CacheItem;
+import org.jboss.ejb3.cache.api.PassivationManager;
+import org.jboss.ejb3.cache.api.StatefulCacheFactory;
+import org.jboss.ejb3.cache.api.StatefulObjectFactory;
import org.jboss.ejb3.cache.impl.TransactionalCache;
import org.jboss.ejb3.cache.impl.backing.NonPassivatingBackingCacheEntry;
import org.jboss.ejb3.cache.impl.backing.NonPassivatingBackingCacheImpl;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/BackingCache.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/BackingCache.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/BackingCache.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -26,8 +26,8 @@
import javax.ejb.NoSuchEJBException;
-import org.jboss.ejb3.cache.Cache;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.Cache;
+import org.jboss.ejb3.cache.api.CacheItem;
/**
* An internal cache to which an external-facing {@link Cache} delegates, either
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/BackingCacheEntry.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/BackingCacheEntry.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/BackingCacheEntry.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -22,7 +22,7 @@
package org.jboss.ejb3.cache.spi;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
/**
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/GroupAwareBackingCache.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/GroupAwareBackingCache.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/GroupAwareBackingCache.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -22,7 +22,7 @@
package org.jboss.ejb3.cache.spi;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
/**
* A {@link BackingCache} that can manage the relationship of its
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/IntegratedObjectStore.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/IntegratedObjectStore.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/IntegratedObjectStore.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -22,8 +22,8 @@
package org.jboss.ejb3.cache.spi;
-import org.jboss.ejb3.cache.CacheItem;
-import org.jboss.ejb3.cache.Identifiable;
+import org.jboss.ejb3.cache.api.CacheItem;
+import org.jboss.ejb3.cache.api.Identifiable;
/**
* An in-memory store for identifiable objects that integrates a persistent store.
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/IntegratedObjectStoreSource.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/IntegratedObjectStoreSource.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/IntegratedObjectStoreSource.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -25,8 +25,8 @@
import javax.transaction.TransactionManager;
import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.cache.CacheItem;
-import org.jboss.ejb3.cache.StatefulCacheFactory;
+import org.jboss.ejb3.cache.api.CacheItem;
+import org.jboss.ejb3.cache.api.StatefulCacheFactory;
/**
* Provides {@link PassivatingIntegratedObjectStore} instances to a
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/ObjectStore.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/ObjectStore.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/ObjectStore.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.cache.spi;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
/**
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/PassivatingBackingCache.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/PassivatingBackingCache.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/PassivatingBackingCache.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.cache.spi;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
import org.jboss.ejb3.cache.impl.backing.SerializationGroupImpl;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/PassivatingIntegratedObjectStore.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/PassivatingIntegratedObjectStore.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/PassivatingIntegratedObjectStore.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -22,8 +22,8 @@
package org.jboss.ejb3.cache.spi;
-import org.jboss.ejb3.cache.Cache;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.Cache;
+import org.jboss.ejb3.cache.api.CacheItem;
/**
* An {@link IntegratedObjectStore} that is able to use its knowledge of
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/SerializationGroup.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/SerializationGroup.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/SerializationGroup.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -1,6 +1,6 @@
package org.jboss.ejb3.cache.spi;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
public interface SerializationGroup<T extends CacheItem>
extends BackingCacheEntry<T>
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/SerializationGroupMember.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/SerializationGroupMember.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/SerializationGroupMember.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -1,6 +1,6 @@
package org.jboss.ejb3.cache.spi;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
public interface SerializationGroupMember<T extends CacheItem>
extends BackingCacheEntry<T>
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/AbstractBackingCacheEntry.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/AbstractBackingCacheEntry.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/AbstractBackingCacheEntry.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.cache.spi.impl;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
import org.jboss.ejb3.cache.spi.BackingCacheEntry;
/**
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/AbstractPassivatingIntegratedObjectStore.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/AbstractPassivatingIntegratedObjectStore.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/AbstractPassivatingIntegratedObjectStore.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -23,7 +23,7 @@
package org.jboss.ejb3.cache.spi.impl;
import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
import org.jboss.ejb3.cache.spi.BackingCacheEntry;
import org.jboss.ejb3.cache.spi.PassivatingBackingCache;
import org.jboss.ejb3.cache.spi.PassivatingIntegratedObjectStore;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/AbstractStatefulCacheFactory.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/AbstractStatefulCacheFactory.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/AbstractStatefulCacheFactory.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -27,8 +27,8 @@
import javax.transaction.TransactionManager;
import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.cache.CacheItem;
-import org.jboss.ejb3.cache.StatefulCacheFactory;
+import org.jboss.ejb3.cache.api.CacheItem;
+import org.jboss.ejb3.cache.api.StatefulCacheFactory;
import org.jboss.ejb3.cache.spi.PassivationExpirationCoordinator;
import org.jboss.ejb3.cache.spi.SynchronizationCoordinator;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/CacheableTimestamp.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/CacheableTimestamp.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/CacheableTimestamp.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -22,7 +22,7 @@
package org.jboss.ejb3.cache.spi.impl;
-import org.jboss.ejb3.cache.Identifiable;
+import org.jboss.ejb3.cache.api.Identifiable;
import org.jboss.ejb3.cache.spi.BackingCacheEntry;
import org.jboss.ejb3.cache.spi.IntegratedObjectStore;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/FileObjectStore.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/FileObjectStore.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/FileObjectStore.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -33,7 +33,7 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
import org.jboss.ejb3.cache.spi.ObjectStore;
import org.jboss.logging.Logger;
import org.jboss.serial.io.JBossObjectInputStream;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/ItemCachePair.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/ItemCachePair.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/main/java/org/jboss/ejb3/cache/spi/impl/ItemCachePair.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -22,8 +22,8 @@
package org.jboss.ejb3.cache.spi.impl;
-import org.jboss.ejb3.cache.Cache;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.Cache;
+import org.jboss.ejb3.cache.api.CacheItem;
import org.jboss.ejb3.cache.spi.GroupAwareBackingCache;
/**
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/distributed/MockIntegratedObjectStoreSource.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/distributed/MockIntegratedObjectStoreSource.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/distributed/MockIntegratedObjectStoreSource.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -25,7 +25,7 @@
import javax.transaction.TransactionManager;
import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
import org.jboss.ejb3.cache.spi.IntegratedObjectStoreSource;
import org.jboss.ejb3.cache.spi.PassivatingIntegratedObjectStore;
import org.jboss.ejb3.cache.spi.SerializationGroup;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/distributed/MockJBCIntegratedObjectStore.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/distributed/MockJBCIntegratedObjectStore.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/distributed/MockJBCIntegratedObjectStore.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -34,7 +34,7 @@
import java.util.TreeSet;
import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
import org.jboss.ejb3.cache.spi.BackingCacheEntry;
import org.jboss.ejb3.cache.spi.IntegratedObjectStore;
import org.jboss.ejb3.cache.spi.PassivatingBackingCache;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/integrated/GroupAwareTransactionalCacheUnitTestCase.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/integrated/GroupAwareTransactionalCacheUnitTestCase.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/integrated/GroupAwareTransactionalCacheUnitTestCase.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.test.cache.integrated;
-import org.jboss.ejb3.cache.Cache;
+import org.jboss.ejb3.cache.api.Cache;
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/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/integrated/TransactionalCacheUnitTestCase.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/integrated/TransactionalCacheUnitTestCase.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/integrated/TransactionalCacheUnitTestCase.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -23,7 +23,7 @@
import javax.ejb.NoSuchEJBException;
-import org.jboss.ejb3.cache.Cache;
+import org.jboss.ejb3.cache.api.Cache;
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/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockBeanContainer.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockBeanContainer.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockBeanContainer.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -25,11 +25,11 @@
import java.util.HashSet;
import java.util.Set;
-import org.jboss.ejb3.cache.Cache;
-import org.jboss.ejb3.cache.PassivationManager;
-import org.jboss.ejb3.cache.StatefulCacheFactory;
-import org.jboss.ejb3.cache.StatefulCacheFactoryRegistry;
-import org.jboss.ejb3.cache.StatefulObjectFactory;
+import org.jboss.ejb3.cache.api.Cache;
+import org.jboss.ejb3.cache.api.PassivationManager;
+import org.jboss.ejb3.cache.api.StatefulCacheFactory;
+import org.jboss.ejb3.cache.api.StatefulCacheFactoryRegistry;
+import org.jboss.ejb3.cache.api.StatefulObjectFactory;
/**
* @author Brian Stansberry
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockCacheItem.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockCacheItem.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockCacheItem.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -22,7 +22,7 @@
package org.jboss.ejb3.test.cache.mock;
-import org.jboss.ejb3.cache.CacheItem;
+import org.jboss.ejb3.cache.api.CacheItem;
/**
* @author Brian Stansberry
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockEjb3System.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockEjb3System.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockEjb3System.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -27,8 +27,8 @@
import javax.transaction.TransactionManager;
-import org.jboss.ejb3.cache.StatefulCacheFactory;
-import org.jboss.ejb3.cache.StatefulCacheFactoryRegistry;
+import org.jboss.ejb3.cache.api.StatefulCacheFactory;
+import org.jboss.ejb3.cache.api.StatefulCacheFactoryRegistry;
import org.jboss.ejb3.cache.impl.factory.GroupAwareCacheFactory;
import org.jboss.ejb3.cache.impl.factory.NonClusteredIntegratedObjectStoreSource;
import org.jboss.ejb3.cache.impl.factory.NonPassivatingCacheFactory;
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockIdentifiable.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockIdentifiable.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockIdentifiable.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -23,7 +23,7 @@
import java.io.Serializable;
-import org.jboss.ejb3.cache.Identifiable;
+import org.jboss.ejb3.cache.api.Identifiable;
/**
* Comment
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockPassivationManager.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockPassivationManager.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockPassivationManager.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -22,7 +22,7 @@
package org.jboss.ejb3.test.cache.mock;
-import org.jboss.ejb3.cache.PassivationManager;
+import org.jboss.ejb3.cache.api.PassivationManager;
/**
* @author Brian Stansberry
Modified: projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockStatefulObjectFactory.java
===================================================================
--- projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockStatefulObjectFactory.java 2008-03-14 15:14:57 UTC (rev 70872)
+++ projects/ejb3/branches/cluster-dev/ejb3-cache/src/test/java/org/jboss/ejb3/test/cache/mock/MockStatefulObjectFactory.java 2008-03-14 15:19:15 UTC (rev 70873)
@@ -24,7 +24,7 @@
import java.util.Map;
-import org.jboss.ejb3.cache.StatefulObjectFactory;
+import org.jboss.ejb3.cache.api.StatefulObjectFactory;
/**
More information about the jboss-cvs-commits
mailing list