[jboss-cvs] JBossAS SVN: r101703 - in projects/ejb3/trunk/core: src/main/java/org/jboss/ejb3 and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 2 03:05:22 EST 2010
Author: wolfc
Date: 2010-03-02 03:05:20 -0500 (Tue, 02 Mar 2010)
New Revision: 101703
Added:
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/NewContextBean.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/NewContextLocal.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/unit/
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/unit/NewContextUnitTestCase.java
Modified:
projects/ejb3/trunk/core/pom.xml
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/BeanContext.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContextImpl.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/MDBContext.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/MessageDrivenContextImpl.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/service/ServiceBeanContext.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionBeanContext.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionContextDelegateBase.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/ProxiedStatefulBeanContext.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulBeanContext.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulSessionContextImpl.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessBeanContext.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1358/MockBeanContext.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/threadlocal/MockBeanContext.java
Log:
EJBTHREE-2020: first integration pass
Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml 2010-03-02 06:51:53 UTC (rev 101702)
+++ projects/ejb3/trunk/core/pom.xml 2010-03-02 08:05:20 UTC (rev 101703)
@@ -455,9 +455,9 @@
</dependency>
<dependency>
- <groupId>org.jboss.ejb3.vfs</groupId>
- <artifactId>jboss-ejb3-vfs-spi</artifactId>
- <version>1.0.0-alpha-1</version>
+ <groupId>org.jboss.ejb3.context</groupId>
+ <artifactId>jboss-ejb3-context-base</artifactId>
+ <version>0.1.0</version>
</dependency>
<dependency>
@@ -466,14 +466,20 @@
<version>0.1.1</version>
</dependency>
- <dependency>
- <groupId>org.jboss.ejb3.timeout</groupId>
- <artifactId>jboss-ejb3-timeout-3.0</artifactId>
- <version>0.1.1</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.timeout</groupId>
+ <artifactId>jboss-ejb3-timeout-3.0</artifactId>
+ <version>0.1.1</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
+ <groupId>org.jboss.ejb3.vfs</groupId>
+ <artifactId>jboss-ejb3-vfs-spi</artifactId>
+ <version>1.0.0-alpha-1</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded</artifactId>
<version>beta3</version>
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/BeanContext.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/BeanContext.java 2010-03-02 06:51:53 UTC (rev 101702)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/BeanContext.java 2010-03-02 08:05:20 UTC (rev 101703)
@@ -21,8 +21,8 @@
*/
package org.jboss.ejb3;
-import javax.ejb.EJBContext;
import org.jboss.aop.metadata.SimpleMetaData;
+import org.jboss.ejb3.context.spi.EJBContext;
import org.jboss.ejb3.interceptor.InterceptorInfo;
/**
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContextImpl.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContextImpl.java 2010-03-02 06:51:53 UTC (rev 101702)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContextImpl.java 2010-03-02 08:05:20 UTC (rev 101703)
@@ -21,11 +21,17 @@
*/
package org.jboss.ejb3;
-import java.security.Identity;
-import java.security.Principal;
-import java.util.Properties;
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.aspects.currentinvocation.CurrentInvocation;
+import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.ejb3.context.spi.BeanManager;
+import org.jboss.ejb3.context.spi.EJBContext;
+import org.jboss.ejb3.interceptors.container.InvocationHelper;
+import org.jboss.ejb3.security.helpers.EJBContextHelper;
+import org.jboss.ejb3.tx.TxUtil;
+import org.jboss.logging.Logger;
+import org.jboss.security.RealmMapping;
-import javax.ejb.EJBContext;
import javax.ejb.EJBException;
import javax.ejb.EJBHome;
import javax.ejb.EJBLocalHome;
@@ -33,16 +39,11 @@
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
import javax.transaction.UserTransaction;
+import java.security.Identity;
+import java.security.Principal;
+import java.util.Map;
+import java.util.Properties;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aspects.currentinvocation.CurrentInvocation;
-import org.jboss.ejb3.annotation.SecurityDomain;
-import org.jboss.ejb3.interceptors.container.InvocationHelper;
-import org.jboss.ejb3.security.helpers.EJBContextHelper;
-import org.jboss.ejb3.tx.TxUtil;
-import org.jboss.logging.Logger;
-import org.jboss.security.RealmMapping;
-
/**
* EJB3 Enterprise Context Implementation
*
@@ -166,8 +167,24 @@
roleName,
ejbc.getEjbName());
}
-
+ public Map<String, Object> getContextData()
+ {
+ // TODO: implement
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+
+ public BeanManager getManager()
+ {
+ // TODO: implement
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+
+ public Object getTarget()
+ {
+ return beanContext.getInstance();
+ }
+
public TimerService getTimerService() throws IllegalStateException
{
Invocation invocation = CurrentInvocation.getCurrentInvocation();
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/MDBContext.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/MDBContext.java 2010-03-02 06:51:53 UTC (rev 101702)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/MDBContext.java 2010-03-02 08:05:20 UTC (rev 101703)
@@ -21,9 +21,8 @@
*/
package org.jboss.ejb3.mdb;
-import javax.ejb.EJBContext;
-
import org.jboss.ejb3.BaseContext;
+import org.jboss.ejb3.context.spi.EJBContext;
/**
* Comment
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/MessageDrivenContextImpl.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/MessageDrivenContextImpl.java 2010-03-02 06:51:53 UTC (rev 101702)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/MessageDrivenContextImpl.java 2010-03-02 08:05:20 UTC (rev 101703)
@@ -21,9 +21,10 @@
*/
package org.jboss.ejb3.mdb;
-import javax.ejb.MessageDrivenContext;
-
import org.jboss.ejb3.EJBContextImpl;
+import org.jboss.ejb3.context.spi.BeanManager;
+import org.jboss.ejb3.context.spi.MessageDrivenBeanManager;
+import org.jboss.ejb3.context.spi.MessageDrivenContext;
/**
* Comment
@@ -39,4 +40,10 @@
{
super(baseContext);
}
+
+ @Override
+ public MessageDrivenBeanManager getManager()
+ {
+ return (MessageDrivenBeanManager) super.getManager();
+ }
}
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/service/ServiceBeanContext.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/service/ServiceBeanContext.java 2010-03-02 06:51:53 UTC (rev 101702)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/service/ServiceBeanContext.java 2010-03-02 08:05:20 UTC (rev 101703)
@@ -21,8 +21,7 @@
*/
package org.jboss.ejb3.service;
-import javax.ejb.EJBContext;
-
+import org.jboss.ejb3.context.spi.EJBContext;
import org.jboss.ejb3.session.SessionBeanContext;
/**
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionBeanContext.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionBeanContext.java 2010-03-02 06:51:53 UTC (rev 101702)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionBeanContext.java 2010-03-02 08:05:20 UTC (rev 101703)
@@ -21,9 +21,8 @@
*/
package org.jboss.ejb3.session;
-import javax.ejb.EJBContext;
-
import org.jboss.ejb3.BaseContext;
+import org.jboss.ejb3.context.spi.EJBContext;
/**
* An instance of an enterprise bean link to its container.
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionContextDelegateBase.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionContextDelegateBase.java 2010-03-02 06:51:53 UTC (rev 101702)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionContextDelegateBase.java 2010-03-02 08:05:20 UTC (rev 101703)
@@ -21,15 +21,17 @@
*/
package org.jboss.ejb3.session;
+import org.jboss.ejb3.EJBContextImpl;
+import org.jboss.ejb3.context.spi.BeanManager;
+import org.jboss.ejb3.context.spi.SessionBeanManager;
+import org.jboss.ejb3.context.spi.SessionContext;
+import org.jboss.ejb3.stateless.StatelessBeanContext;
+import org.jboss.logging.Logger;
+
import javax.ejb.EJBLocalObject;
import javax.ejb.EJBObject;
-import javax.ejb.SessionContext;
import javax.xml.rpc.handler.MessageContext;
-import org.jboss.ejb3.EJBContextImpl;
-import org.jboss.ejb3.stateless.StatelessBeanContext;
-import org.jboss.logging.Logger;
-
/**
* Comment
*
@@ -39,8 +41,7 @@
public abstract class SessionContextDelegateBase<J extends SessionSpecContainer>
extends
EJBContextImpl<J, SessionBeanContext<J>>
- implements
- SessionContext
+ implements SessionContext
{
// Class Members
@SuppressWarnings("unused")
@@ -72,7 +73,13 @@
{
return container.getInvokedBusinessInterface();
}
-
+
+ @Override
+ public SessionBeanManager getManager()
+ {
+ return (SessionBeanManager) super.getManager();
+ }
+
public MessageContext getMessageContext() throws IllegalStateException
{
// disallowed for stateful session beans (EJB3 FR 4.4.1 p 81)
@@ -85,4 +92,10 @@
}
throw new UnsupportedOperationException("Only stateless beans can have a message context");
}
+
+ public boolean wasCancelCalled()
+ {
+ // TODO: implement
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
}
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/ProxiedStatefulBeanContext.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/ProxiedStatefulBeanContext.java 2010-03-02 06:51:53 UTC (rev 101702)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/ProxiedStatefulBeanContext.java 2010-03-02 08:05:20 UTC (rev 101703)
@@ -21,6 +21,12 @@
*/
package org.jboss.ejb3.stateful;
+import org.jboss.aop.metadata.SimpleMetaData;
+import org.jboss.ejb3.context.spi.EJBContext;
+import org.jboss.ejb3.interceptor.InterceptorInfo;
+
+import javax.ejb.NoSuchEJBException;
+import javax.persistence.EntityManager;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
@@ -29,13 +35,6 @@
import java.util.Map;
import java.util.concurrent.locks.ReentrantLock;
-import javax.ejb.EJBContext;
-import javax.ejb.NoSuchEJBException;
-import javax.persistence.EntityManager;
-
-import org.jboss.aop.metadata.SimpleMetaData;
-import org.jboss.ejb3.interceptor.InterceptorInfo;
-
/**
* Proxy to a NestedStatefulBeanContext that can be independently passivated,
* activated and replicated without disturbing the object it is proxying.
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulBeanContext.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulBeanContext.java 2010-03-02 06:51:53 UTC (rev 101702)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulBeanContext.java 2010-03-02 08:05:20 UTC (rev 101703)
@@ -21,30 +21,13 @@
*/
package org.jboss.ejb3.stateful;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.locks.ReentrantLock;
-
-import javax.ejb.EJBContext;
-import javax.persistence.EntityManager;
-import javax.transaction.RollbackException;
-import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-
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.Optimized;
import org.jboss.ejb3.cache.StatefulCache;
+import org.jboss.ejb3.context.spi.EJBContext;
import org.jboss.ejb3.interceptor.InterceptorInfo;
import org.jboss.ejb3.session.SessionSpecBeanContext;
import org.jboss.ejb3.tx.TxUtil;
@@ -52,6 +35,22 @@
import org.jboss.tm.TxUtils;
import org.jboss.util.id.GUID;
+import javax.persistence.EntityManager;
+import javax.transaction.RollbackException;
+import javax.transaction.Synchronization;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.ReentrantLock;
+
/**
* BeanContext for a stateful session bean.
*
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulSessionContextImpl.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulSessionContextImpl.java 2010-03-02 06:51:53 UTC (rev 101702)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulSessionContextImpl.java 2010-03-02 08:05:20 UTC (rev 101703)
@@ -21,23 +21,24 @@
*/
package org.jboss.ejb3.stateful;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.security.Identity;
-import java.security.Principal;
-import java.util.Properties;
+import org.jboss.ejb3.Ejb3Registry;
+import org.jboss.ejb3.context.spi.SessionBeanManager;
+import org.jboss.ejb3.context.spi.SessionContext;
import javax.ejb.EJBHome;
import javax.ejb.EJBLocalHome;
import javax.ejb.EJBLocalObject;
import javax.ejb.EJBObject;
-import javax.ejb.SessionContext;
import javax.ejb.TimerService;
import javax.transaction.UserTransaction;
import javax.xml.rpc.handler.MessageContext;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.security.Identity;
+import java.security.Principal;
+import java.util.Map;
+import java.util.Properties;
-import org.jboss.ejb3.Ejb3Registry;
-
/**
* A session context that is serializable.
*
@@ -119,6 +120,11 @@
return getDelegate().getBusinessObject(businessInterface);
}
+ public Map<String, Object> getContextData()
+ {
+ return getDelegate().getContextData();
+ }
+
protected SessionContext getDelegate()
{
if(delegate == null)
@@ -147,6 +153,11 @@
return getDelegate().getInvokedBusinessInterface();
}
+ public SessionBeanManager getManager()
+ {
+ return getDelegate().getManager();
+ }
+
public MessageContext getMessageContext() throws IllegalStateException
{
return getDelegate().getMessageContext();
@@ -183,6 +194,11 @@
return getDelegate().getRollbackOnly();
}
+ public Object getTarget()
+ {
+ return getDelegate().getTarget();
+ }
+
public TimerService getTimerService() throws IllegalStateException
{
return getDelegate().getTimerService();
@@ -218,4 +234,9 @@
{
return super.toString() + "{containerGuid=" + containerGuid + ",id=" + id + "}";
}
+
+ public boolean wasCancelCalled()
+ {
+ return getDelegate().wasCancelCalled();
+ }
}
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessBeanContext.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessBeanContext.java 2010-03-02 06:51:53 UTC (rev 101702)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessBeanContext.java 2010-03-02 08:05:20 UTC (rev 101703)
@@ -21,8 +21,7 @@
*/
package org.jboss.ejb3.stateless;
-import javax.ejb.EJBContext;
-
+import org.jboss.ejb3.context.spi.EJBContext;
import org.jboss.ejb3.session.SessionSpecBeanContext;
import org.jboss.injection.lang.reflect.BeanProperty;
import org.jboss.logging.Logger;
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1358/MockBeanContext.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1358/MockBeanContext.java 2010-03-02 06:51:53 UTC (rev 101702)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1358/MockBeanContext.java 2010-03-02 08:05:20 UTC (rev 101703)
@@ -21,9 +21,8 @@
*/
package org.jboss.ejb3.core.test.ejbthree1358;
-import javax.ejb.EJBContext;
-
import org.jboss.ejb3.BaseContext;
+import org.jboss.ejb3.context.spi.EJBContext;
/**
* @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
Added: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/NewContextBean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/NewContextBean.java (rev 0)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/NewContextBean.java 2010-03-02 08:05:20 UTC (rev 101703)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright (c) 2010, JBoss Inc., 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.core.test.ejbthree2020;
+
+import org.jboss.ejb3.context.spi.SessionContext;
+
+import javax.annotation.Resource;
+import javax.ejb.Stateless;
+
+/**
+ * @author <a href="cdewolf at redhat.com">Carlo de Wolf</a>
+ */
+ at Stateless
+public class NewContextBean implements NewContextLocal
+{
+ // the spi one
+ @Resource
+ private SessionContext ctx;
+
+ public Class<?> getInvokedBusinessInterface()
+ {
+ return ctx.getInvokedBusinessInterface();
+ }
+}
Property changes on: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/NewContextBean.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/NewContextLocal.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/NewContextLocal.java (rev 0)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/NewContextLocal.java 2010-03-02 08:05:20 UTC (rev 101703)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright (c) 2010, JBoss Inc., 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.core.test.ejbthree2020;
+
+/**
+ * @author <a href="cdewolf at redhat.com">Carlo de Wolf</a>
+ */
+public interface NewContextLocal
+{
+ Class<?> getInvokedBusinessInterface();
+}
Property changes on: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/NewContextLocal.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/unit/NewContextUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/unit/NewContextUnitTestCase.java (rev 0)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/unit/NewContextUnitTestCase.java 2010-03-02 08:05:20 UTC (rev 101703)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright (c) 2010, JBoss Inc., 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.core.test.ejbthree2020.unit;
+
+import org.jboss.ejb3.core.test.common.AbstractEJB3TestCase;
+import org.jboss.ejb3.core.test.ejbthree2020.NewContextBean;
+import org.jboss.ejb3.core.test.ejbthree2020.NewContextLocal;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author <a href="cdewolf at redhat.com">Carlo de Wolf</a>
+ */
+public class NewContextUnitTestCase extends AbstractEJB3TestCase
+{
+ @BeforeClass
+ public static void beforeClass() throws Exception
+ {
+ AbstractEJB3TestCase.beforeClass();
+
+ deploySessionEjb(NewContextBean.class);
+ }
+
+ @Test
+ public void testInvokedBusinessInterface() throws Exception
+ {
+ NewContextLocal bean = lookup(NewContextBean.class.getSimpleName() + "/local-" + NewContextLocal.class.getName(), NewContextLocal.class);
+
+ Class<?> result = bean.getInvokedBusinessInterface();
+
+ assertEquals(NewContextLocal.class, result);
+ }
+}
Property changes on: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree2020/unit/NewContextUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/threadlocal/MockBeanContext.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/threadlocal/MockBeanContext.java 2010-03-02 06:51:53 UTC (rev 101702)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/threadlocal/MockBeanContext.java 2010-03-02 08:05:20 UTC (rev 101703)
@@ -21,11 +21,10 @@
*/
package org.jboss.ejb3.test.threadlocal;
-import javax.ejb.EJBContext;
-
import org.jboss.aop.metadata.SimpleMetaData;
import org.jboss.ejb3.BeanContext;
import org.jboss.ejb3.Container;
+import org.jboss.ejb3.context.spi.EJBContext;
import org.jboss.ejb3.interceptor.InterceptorInfo;
import org.jboss.logging.Logger;
More information about the jboss-cvs-commits
mailing list