[jboss-cvs] JBossAS SVN: r65006 - in trunk: ejb3 and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 3 05:39:03 EDT 2007
Author: wolfc
Date: 2007-09-03 05:39:02 -0400 (Mon, 03 Sep 2007)
New Revision: 65006
Modified:
trunk/build/build-distr.xml
trunk/build/build-thirdparty.xml
trunk/ejb3/.classpath
trunk/ejb3/build-test.xml
trunk/ejb3/build.xml
trunk/ejb3/src/main/org/jboss/ejb3/cache/StatefulCache.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java
Log:
EJBTHREE-1016: refactoring cache spi
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2007-09-02 04:06:20 UTC (rev 65005)
+++ trunk/build/build-distr.xml 2007-09-03 09:39:02 UTC (rev 65006)
@@ -156,6 +156,7 @@
<!-- Copy the third party libraries -->
<copy todir="${install.all.lib}" filtering="no">
+ <fileset dir="${jboss.jboss.ejb3.cache.lib}" includes="*.jar"/>
<fileset dir="${hibernate.commons.annotations.lib}" includes="*.jar"/>
<fileset dir="${hibernate.entitymanager.lib}" includes="*.jar"/>
<fileset dir="${hibernate.annotations.lib}" includes="*.jar"/>
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2007-09-02 04:06:20 UTC (rev 65005)
+++ trunk/build/build-thirdparty.xml 2007-09-03 09:39:02 UTC (rev 65006)
@@ -90,6 +90,7 @@
<componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
<componentref name="jboss/integration" version="snapshot"/>
<componentref name="jboss/jaxr" version="1.2.0.GA"/>
+ <componentref name="jboss/jboss-ejb3-cache" version="0.11-SNAPSHOT"/>
<componentref name="jboss/jboss-jaspi-api" version="1.0-SNAPSHOT"/>
<componentref name="jboss/jboss-javaee" version="5.0.0-SNAPSHOT"/>
<componentref name="jboss/jboss-security-spi" version="2.0.1-SNAPSHOT"/>
Modified: trunk/ejb3/.classpath
===================================================================
--- trunk/ejb3/.classpath 2007-09-02 04:06:20 UTC (rev 65005)
+++ trunk/ejb3/.classpath 2007-09-03 09:39:02 UTC (rev 65006)
@@ -60,5 +60,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi.jar" sourcepath="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbosssx/lib/jbosssx.jar" sourcepath="/thirdparty/jboss/security/lib/jbosssx-sources.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/main"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-cache/lib/jboss-ejb3-cache-0.11-SNAPSHOT.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-cache/lib/jboss-ejb3-cache-0.11-SNAPSHOT-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml 2007-09-02 04:06:20 UTC (rev 65005)
+++ trunk/ejb3/build-test.xml 2007-09-03 09:39:02 UTC (rev 65006)
@@ -157,6 +157,7 @@
<path refid="hsqldb.hsqldb.classpath"/>
<path refid="jboss.jboss.vfs.classpath"/>
<path refid="jboss.integration.classpath"/>
+ <path refid="jboss.jboss.ejb3.cache.classpath"/>
</path>
<!-- ======= -->
Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml 2007-09-02 04:06:20 UTC (rev 65005)
+++ trunk/ejb3/build.xml 2007-09-03 09:39:02 UTC (rev 65006)
@@ -109,6 +109,7 @@
<!-- FIXME: temporary for EJBTHREE-485 -->
<path refid="cglib.classpath"/>
<path refid="jboss.integration.classpath"/>
+ <path refid="jboss.jboss.ejb3.cache.classpath"/>
</path>
<!-- ======= -->
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/StatefulCache.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/StatefulCache.java 2007-09-02 04:06:20 UTC (rev 65005)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/StatefulCache.java 2007-09-03 09:39:02 UTC (rev 65006)
@@ -30,15 +30,17 @@
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
+ * @deprecated use Cache
*/
-public interface StatefulCache
+ at Deprecated
+public interface StatefulCache extends Cache<StatefulBeanContext>
{
/**
* returns a key not the actual object
*/
public StatefulBeanContext create();
- public StatefulBeanContext create(Class[] initTypes, Object[] initValues);
+ public StatefulBeanContext create(Class<?>[] initTypes, Object[] initValues);
/**
* Gets the context with the given id.
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java 2007-09-02 04:06:20 UTC (rev 65005)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java 2007-09-03 09:39:02 UTC (rev 65006)
@@ -39,6 +39,7 @@
import org.jboss.aop.metadata.SimpleMetaData;
import org.jboss.ejb3.Ejb3Registry;
import org.jboss.ejb3.ThreadLocalStack;
+import org.jboss.ejb3.cache.Identifiable;
import org.jboss.ejb3.cache.StatefulCache;
import org.jboss.ejb3.interceptor.InterceptorInfo;
import org.jboss.ejb3.session.SessionBeanContext;
@@ -58,7 +59,7 @@
*
* @version $Revision$
*/
-public class StatefulBeanContext extends SessionBeanContext implements Serializable
+public class StatefulBeanContext extends SessionBeanContext implements Identifiable, Serializable
{
/** The serialVersionUID */
private static final long serialVersionUID = -102470788178912606L;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java 2007-09-02 04:06:20 UTC (rev 65005)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java 2007-09-03 09:39:02 UTC (rev 65006)
@@ -56,6 +56,7 @@
import org.jboss.ejb3.ProxyFactoryHelper;
import org.jboss.ejb3.ProxyUtils;
import org.jboss.ejb3.cache.StatefulCache;
+import org.jboss.ejb3.cache.StatefulObjectFactory;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
import org.jboss.ejb3.proxy.EJBMetaDataImpl;
import org.jboss.ejb3.proxy.handle.HomeHandleImpl;
@@ -71,7 +72,7 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
-public class StatefulContainer extends SessionContainer
+public class StatefulContainer extends SessionContainer implements StatefulObjectFactory<StatefulBeanContext>
{
private static final Logger log = Logger.getLogger(StatefulContainer.class);
@@ -85,6 +86,11 @@
super(cl, beanClassName, ejbName, manager, ctxProperties, interceptorRepository, deployment);
}
+ public StatefulBeanContext create(Class<?>[] initTypes, Object[] initValues)
+ {
+ return (StatefulBeanContext) createBeanContext();
+ }
+
@Override
public BeanContext<?> createBeanContext()
{
@@ -111,6 +117,11 @@
}
}
+ public void destroy(StatefulBeanContext obj)
+ {
+ invokePreDestroy(obj);
+ }
+
public Object getMBean()
{
return mbean;
More information about the jboss-cvs-commits
mailing list