[jboss-cvs] JBossAS SVN: r85728 - in projects/ejb3/trunk: proxy/src/main/java/org/jboss/ejb3/proxy/container and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 11 05:18:21 EDT 2009
Author: ALRubinger
Date: 2009-03-11 05:18:21 -0400 (Wed, 11 Mar 2009)
New Revision: 85728
Added:
projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/container/StatefulSessionFactory.java
Removed:
projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/container/StatefulSessionInvokableContext.java
Modified:
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java
projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/factory/session/stateful/StatefulSessionProxyFactoryBase.java
projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/container/StatefulContainer.java
Log:
[EJBTHREE-1763] StatefulSessionInvokableContext > StatefulSessionFactory
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java 2009-03-11 08:46:17 UTC (rev 85727)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java 2009-03-11 09:18:21 UTC (rev 85728)
@@ -66,7 +66,7 @@
import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
import org.jboss.ejb3.interceptors.container.StatefulSessionContainerMethodInvocation;
import org.jboss.ejb3.proxy.clustered.objectstore.ClusteredObjectStoreBindings;
-import org.jboss.ejb3.proxy.container.StatefulSessionInvokableContext;
+import org.jboss.ejb3.proxy.container.StatefulSessionFactory;
import org.jboss.ejb3.proxy.factory.ProxyFactoryHelper;
import org.jboss.ejb3.proxy.factory.session.stateful.StatefulSessionProxyFactory;
import org.jboss.ejb3.proxy.impl.EJBMetaDataImpl;
@@ -96,7 +96,7 @@
public class StatefulContainer extends SessionSpecContainer
implements
StatefulObjectFactory<StatefulBeanContext>,
- StatefulSessionInvokableContext
+ StatefulSessionFactory
{
private static final Logger log = Logger.getLogger(StatefulContainer.class);
Copied: projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/container/StatefulSessionFactory.java (from rev 85702, projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/container/StatefulSessionInvokableContext.java)
===================================================================
--- projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/container/StatefulSessionFactory.java (rev 0)
+++ projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/container/StatefulSessionFactory.java 2009-03-11 09:18:21 UTC (rev 85728)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.proxy.container;
+
+import java.io.Serializable;
+
+/**
+ * StatefulSessionFactory
+ *
+ * Capable of creating new SFSB Sessions
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+public interface StatefulSessionFactory
+{
+ /**
+ * Creates a new user session and returns the unique Session ID
+ *
+ * @return
+ */
+ Serializable createSession();
+}
Property changes on: projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/container/StatefulSessionFactory.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/container/StatefulSessionInvokableContext.java
===================================================================
--- projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/container/StatefulSessionInvokableContext.java 2009-03-11 08:46:17 UTC (rev 85727)
+++ projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/container/StatefulSessionInvokableContext.java 2009-03-11 09:18:21 UTC (rev 85728)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.proxy.container;
-
-import java.io.Serializable;
-
-/**
- * StatefulSessionInvokableContext
- *
- * Represents an object capable of carrying out
- * EJB3 SFSB Invocations as described by an
- * Invocation descriptor
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public interface StatefulSessionInvokableContext extends InvokableContext
-{
- /**
- * Creates a new user session and returns the unique Session ID
- *
- * @return
- */
- Serializable createSession();
-}
Modified: projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/factory/session/stateful/StatefulSessionProxyFactoryBase.java
===================================================================
--- projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/factory/session/stateful/StatefulSessionProxyFactoryBase.java 2009-03-11 08:46:17 UTC (rev 85727)
+++ projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/factory/session/stateful/StatefulSessionProxyFactoryBase.java 2009-03-11 09:18:21 UTC (rev 85728)
@@ -30,7 +30,7 @@
import org.jboss.ejb3.common.registrar.spi.Ejb3Registrar;
import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
import org.jboss.ejb3.common.registrar.spi.NotBoundException;
-import org.jboss.ejb3.proxy.container.StatefulSessionInvokableContext;
+import org.jboss.ejb3.proxy.container.StatefulSessionFactory;
import org.jboss.ejb3.proxy.factory.session.SessionProxyFactoryBase;
import org.jboss.ejb3.proxy.handler.session.stateful.StatefulProxyInvocationHandlerBase;
import org.jboss.ejb3.proxy.intf.StatefulSessionProxy;
@@ -62,7 +62,7 @@
/**
* The Container used by this SFSB Proxy Factory
*/
- private transient StatefulSessionInvokableContext container;
+ private transient StatefulSessionFactory container;
// --------------------------------------------------------------------------------||
// Constructor --------------------------------------------------------------------||
@@ -287,7 +287,7 @@
protected Serializable getNewSessionId()
{
// Obtain the Container
- StatefulSessionInvokableContext container = this.getContainer();
+ StatefulSessionFactory container = this.getContainer();
// Get a new Session ID from the Container
Serializable sessionId = null;
@@ -318,22 +318,22 @@
*
* @return The Container for this Proxy Factory
*/
- protected StatefulSessionInvokableContext obtainContainer()
+ protected StatefulSessionFactory obtainContainer()
{
/*
* Obtain the Container
*/
- StatefulSessionInvokableContext container = null;
+ StatefulSessionFactory container = null;
String containerName = this.getContainerName();
// Lookup from EJB3 Registrar
try
{
Object obj = Ejb3RegistrarLocator.locateRegistrar().lookup(containerName);
- assert obj instanceof StatefulSessionInvokableContext : "Container retrieved from "
+ assert obj instanceof StatefulSessionFactory : "Container retrieved from "
+ Ejb3Registrar.class.getSimpleName() + " was not of expected type "
- + StatefulSessionInvokableContext.class.getName() + " but was instead " + obj;
- container = (StatefulSessionInvokableContext) obj;
+ + StatefulSessionFactory.class.getName() + " but was instead " + obj;
+ container = (StatefulSessionFactory) obj;
}
catch (NotBoundException nbe)
{
@@ -350,7 +350,7 @@
// Accessors / Mutators -----------------------------------------------------------||
// --------------------------------------------------------------------------------||
- public StatefulSessionInvokableContext getContainer()
+ public StatefulSessionFactory getContainer()
{
if (this.container == null)
{
@@ -360,7 +360,7 @@
return this.container;
}
- public void setContainer(StatefulSessionInvokableContext container)
+ public void setContainer(StatefulSessionFactory container)
{
this.container = container;
}
Modified: projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/container/StatefulContainer.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/container/StatefulContainer.java 2009-03-11 08:46:17 UTC (rev 85727)
+++ projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/container/StatefulContainer.java 2009-03-11 09:18:21 UTC (rev 85728)
@@ -26,7 +26,7 @@
import java.util.Map;
import java.util.UUID;
-import org.jboss.ejb3.proxy.container.StatefulSessionInvokableContext;
+import org.jboss.ejb3.proxy.container.StatefulSessionFactory;
import org.jboss.ejb3.proxy.objectstore.ObjectStoreBindings;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
@@ -38,7 +38,7 @@
* @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
* @version $Revision: $
*/
-public class StatefulContainer extends SessionSpecContainer implements StatefulSessionInvokableContext
+public class StatefulContainer extends SessionSpecContainer implements StatefulSessionFactory
{
// --------------------------------------------------------------------------------||
More information about the jboss-cvs-commits
mailing list