[jboss-cvs] JBossAS SVN: r63502 - in trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext: unit and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 13 11:16:24 EDT 2007
Author: bdecoste
Date: 2007-06-13 11:16:24 -0400 (Wed, 13 Jun 2007)
New Revision: 63502
Added:
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulLocal.java
Modified:
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateful.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulRemote.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateless.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java
Log:
[EJBTHREE-991],[EJBTHREE-992] merged changes from Branch_4_2
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateful.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateful.java 2007-06-13 14:39:32 UTC (rev 63501)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateful.java 2007-06-13 15:16:24 UTC (rev 63502)
@@ -21,6 +21,9 @@
*/
package org.jboss.ejb3.test.ejbcontext;
+import javax.ejb.EJBLocalObject;
+import javax.ejb.EJBObject;
+
import javax.ejb.Remote;
@@ -43,8 +46,12 @@
public Object getBusinessObject() throws Exception;
-
String getState();
void setState(String state);
+
+ EJBLocalObject getEJBLocalObject();
+
+ EJBObject getEJBObject();
+
}
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java 2007-06-13 14:39:32 UTC (rev 63501)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java 2007-06-13 15:16:24 UTC (rev 63502)
@@ -21,11 +21,20 @@
*/
package org.jboss.ejb3.test.ejbcontext;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
import javax.ejb.EJB;
import javax.ejb.EJBContext;
+import javax.ejb.EJBLocalObject;
+import javax.ejb.EJBObject;
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.SessionContext;
import javax.ejb.Stateful;
+
import javax.naming.InitialContext;
+import org.jboss.annotation.ejb.LocalBinding;
import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.annotation.ejb.RemoteBindings;
import org.jboss.logging.Logger;
@@ -37,6 +46,9 @@
* @version $Revision$
*/
@Stateful(name="Stateful")
+ at Remote({org.jboss.ejb3.test.ejbcontext.Stateful.class, StatefulRemote.class})
+ at Local(StatefulLocal.class)
+ at LocalBinding(jndiBinding="StatefulLocal")
@RemoteBindings({@RemoteBinding(jndiBinding = "Stateful"), @RemoteBinding(jndiBinding = "StatefulRemote")})
public class StatefulBean extends BaseBean
implements org.jboss.ejb3.test.ejbcontext.Stateful, StatefulRemote
@@ -45,7 +57,11 @@
@EJB(mappedName="StatefulRemote")
StatefulRemote statefulRemote = null;
+
+ @EJB StatefulLocalOnly statefulLocalOnly;
+ EJBLocalObject ejbLocalObject;
+ EJBObject ejbObject;
String state = "";
public void testEjbContext() throws Exception
@@ -59,6 +75,16 @@
{
}
+
+ public EJBLocalObject getEJBLocalObject()
+ {
+ return ejbLocalObject;
+ }
+
+ public EJBObject getEJBObject()
+ {
+ return ejbObject;
+ }
public String getState()
{
@@ -90,4 +116,17 @@
{
return statefulRemote.testInvokedBusinessInterface2();
}
+
+ @PostConstruct
+ public void postConstruct()
+ {
+ ejbLocalObject = sessionContext.getEJBLocalObject();
+ ejbObject = sessionContext.getEJBObject();
+ }
+
+ public Object testLocalOnlyGetBusinessObject() throws Exception
+ {
+ return statefulLocalOnly.getBusinessObject();
+ }
+
}
Added: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulLocal.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulLocal.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulLocal.java 2007-06-13 15:16:24 UTC (rev 63502)
@@ -0,0 +1,35 @@
+/*
+ * 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.test.ejbcontext;
+
+import javax.ejb.EJBLocalObject;
+
+/**
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+public interface StatefulLocal extends EJBLocalObject
+{
+ String getState();
+
+ void setState(String state);
+}
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulRemote.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulRemote.java 2007-06-13 14:39:32 UTC (rev 63501)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulRemote.java 2007-06-13 15:16:24 UTC (rev 63502)
@@ -34,4 +34,6 @@
public interface StatefulRemote
{
public Class testInvokedBusinessInterface2() throws Exception;
+
+ Object testLocalOnlyGetBusinessObject() throws Exception;
}
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateless.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateless.java 2007-06-13 14:39:32 UTC (rev 63501)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/Stateless.java 2007-06-13 15:16:24 UTC (rev 63502)
@@ -40,4 +40,6 @@
public void testEjbLocalObject() throws Exception;
public void noop();
+
+ void testSessionContext() throws Exception;
}
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java 2007-06-13 14:39:32 UTC (rev 63501)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java 2007-06-13 15:16:24 UTC (rev 63502)
@@ -21,14 +21,23 @@
*/
package org.jboss.ejb3.test.ejbcontext;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+
+import javax.ejb.EJBLocalObject;
+import javax.ejb.EJBObject;
import javax.ejb.Local;
import javax.ejb.Remote;
+import javax.ejb.SessionContext;
import javax.ejb.Stateless;
+import javax.naming.InitialContext;
+
import org.jboss.annotation.ejb.LocalBinding;
import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.logging.Logger;
+
/**
* Comment
*
@@ -46,6 +55,12 @@
@SuppressWarnings("unused")
private static final Logger log = Logger.getLogger(StatelessBean.class);
+ @Resource
+ SessionContext sessionContext;
+
+ StatelessLocal ejbLocalObject;
+ org.jboss.ejb3.test.ejbcontext.Stateless ejbObject;
+
public void noop()
{
@@ -73,4 +88,36 @@
javax.ejb.EJBLocalObject ejbObject = sessionContext.getEJBLocalObject();
ejbObject.getClass();
}
+
+ public void testSessionContext() throws Exception
+ {
+ InitialContext jndiContext = new InitialContext();
+ Stateful stateful = (Stateful)jndiContext.lookup("Stateful");
+ stateful.setState("testSessionContext");
+
+ EJBLocalObject ejbLocalObject = stateful.getEJBLocalObject();
+
+ StatefulLocal sameLocalBean = (StatefulLocal)ejbLocalObject;
+ String state = sameLocalBean.getState();
+ if (!state.equals("testSessionContext"))
+ throw new Exception("EJBLocalObject does not match originating bean: " + state + " != " + "testSessionContext");
+
+ EJBObject ejbObject = stateful.getEJBObject();
+ Stateful sameBean = (Stateful)ejbObject;
+ state = sameBean.getState();
+ if (!state.equals("testSessionContext"))
+ throw new Exception("EJBObject does not match originating bean: " + state + " != " + "testSessionContext");
+
+ this.ejbLocalObject.noop();
+
+ this.ejbObject.noop();
+ }
+
+ @PostConstruct
+ public void postConstruct()
+ {
+ ejbLocalObject = (StatelessLocal)sessionContext.getEJBLocalObject();
+ ejbObject = (org.jboss.ejb3.test.ejbcontext.Stateless)sessionContext.getEJBObject();
+ }
+
}
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java 2007-06-13 14:39:32 UTC (rev 63501)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/unit/EjbContextUnitTestCase.java 2007-06-13 15:16:24 UTC (rev 63502)
@@ -58,6 +58,12 @@
stateless.testEjbContextLookup();
}
+ public void testSessionContext() throws Exception
+ {
+ Stateless stateless = (Stateless)getInitialContext().lookup("Stateless");
+ stateless.testSessionContext();
+ }
+
public void testConcurrentInvokedBusinessInterface() throws Exception
{
for (int i = 0 ; i < 100 ; ++i)
More information about the jboss-cvs-commits
mailing list