[jboss-cvs] JBossAS SVN: r78781 - in projects/ejb3/trunk/embedded/src: main/java/org/jboss/ejb3/embedded/deployment and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 23 06:00:08 EDT 2008
Author: wolfc
Date: 2008-09-23 06:00:08 -0400 (Tue, 23 Sep 2008)
New Revision: 78781
Added:
projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/
projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/StatefulGreeter.java
projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/StatefulGreeterBean.java
projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/unit/
projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/unit/StatefulGreeterTestCase.java
Modified:
projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployers/EjbComponentDeployer.java
projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployment/EjbDeployment.java
Log:
EJBTHREE-1492: deploy stateful beans
Modified: projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployers/EjbComponentDeployer.java
===================================================================
--- projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployers/EjbComponentDeployer.java 2008-09-23 09:14:53 UTC (rev 78780)
+++ projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployers/EjbComponentDeployer.java 2008-09-23 10:00:08 UTC (rev 78781)
@@ -36,6 +36,7 @@
import org.jboss.ejb3.javaee.JavaEEComponentHelper;
import org.jboss.ejb3.javaee.JavaEEModule;
import org.jboss.ejb3.javaee.SimpleJavaEEModule;
+import org.jboss.ejb3.stateful.StatefulContainer;
import org.jboss.ejb3.stateless.StatelessContainer;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
@@ -83,7 +84,7 @@
{
try
{
- boolean stateful = ((JBossSessionBeanMetaData) metaData).isStateful();
+ boolean isStateful = ((JBossSessionBeanMetaData) metaData).isStateful();
String domainName = metaData.getAopDomainName();
if(domainName == null)
domainName = deployment.getDefaultSLSBDomain();
@@ -91,7 +92,10 @@
if(domainDefintion == null)
throw new DeploymentException("Can't find domain " + domainName + " for " + componentName);
domain = (Domain) domainDefintion.getManager();
- component = new StatelessContainer(classLoader, componentClassName, ejbName, domain, ctxProperties, deployment, (JBossSessionBeanMetaData) metaData);
+ if(isStateful)
+ component = new StatefulContainer(classLoader, componentClassName, ejbName, domain, ctxProperties, deployment, (JBossSessionBeanMetaData) metaData);
+ else
+ component = new StatelessContainer(classLoader, componentClassName, ejbName, domain, ctxProperties, deployment, (JBossSessionBeanMetaData) metaData);
}
catch (ClassNotFoundException e)
{
Modified: projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployment/EjbDeployment.java
===================================================================
--- projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployment/EjbDeployment.java 2008-09-23 09:14:53 UTC (rev 78780)
+++ projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployment/EjbDeployment.java 2008-09-23 10:00:08 UTC (rev 78781)
@@ -28,6 +28,8 @@
import org.jboss.ejb3.DeploymentScope;
import org.jboss.ejb3.DeploymentUnit;
import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.cache.CacheFactoryRegistry;
+import org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry;
import org.jboss.ejb3.javaee.JavaEEComponent;
import org.jboss.ejb3.pool.PoolFactoryRegistry;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
@@ -81,12 +83,26 @@
@Inject
@Override
+ public void setCacheFactoryRegistry(CacheFactoryRegistry registry)
+ {
+ super.setCacheFactoryRegistry(registry);
+ }
+
+ @Inject
+ @Override
public void setPoolFactoryRegistry(PoolFactoryRegistry poolFactoryRegistry)
{
super.setPoolFactoryRegistry(poolFactoryRegistry);
}
+ @Inject
@Override
+ public void setPersistenceManagerFactoryRegistry(PersistenceManagerFactoryRegistry registry)
+ {
+ super.setPersistenceManagerFactoryRegistry(registry);
+ }
+
+ @Override
public void start() throws Exception
{
// make sure we don't invoke legacy stuff
Added: projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/StatefulGreeter.java
===================================================================
--- projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/StatefulGreeter.java (rev 0)
+++ projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/StatefulGreeter.java 2008-09-23 10:00:08 UTC (rev 78781)
@@ -0,0 +1,33 @@
+/*
+ * 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.embedded.test.stateful;
+
+/**
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface StatefulGreeter
+{
+ String sayHi();
+
+ void setName(String name);
+}
Added: projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/StatefulGreeterBean.java
===================================================================
--- projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/StatefulGreeterBean.java (rev 0)
+++ projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/StatefulGreeterBean.java 2008-09-23 10:00:08 UTC (rev 78781)
@@ -0,0 +1,51 @@
+/*
+ * 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.embedded.test.stateful;
+
+import javax.ejb.Stateful;
+
+import org.jboss.ejb3.annotation.Cache;
+
+/**
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Stateful
+ at Cache("NoPassivationCache")
+//@PersistenceManager("StatefulSessionFilePersistenceManager")
+public class StatefulGreeterBean implements StatefulGreeter
+{
+ private String name;
+
+ public String sayHi()
+ {
+ if(name == null)
+ throw new IllegalStateException("name has not been set");
+ return "Hi " + name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+}
Added: projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/unit/StatefulGreeterTestCase.java
===================================================================
--- projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/unit/StatefulGreeterTestCase.java (rev 0)
+++ projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/unit/StatefulGreeterTestCase.java 2008-09-23 10:00:08 UTC (rev 78781)
@@ -0,0 +1,79 @@
+/*
+ * 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.embedded.test.stateful.unit;
+
+import static org.junit.Assert.assertEquals;
+
+import java.net.URL;
+import java.util.Date;
+import java.util.Properties;
+
+import javax.ejb.EJBContainer;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.ejb3.embedded.test.stateful.StatefulGreeter;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class StatefulGreeterTestCase
+{
+ @AfterClass
+ public static void afterClass()
+ {
+ EJBContainer current = EJBContainer.getCurrentEJBContainer();
+ if(current != null)
+ current.close();
+ }
+
+ @BeforeClass
+ public static void beforeClass()
+ {
+ Properties properties = new Properties();
+ String module = getURLToTestClasses();
+ EJBContainer.createEJBContainer(properties, module);
+ }
+
+ private static String getURLToTestClasses()
+ {
+ String p = "org/jboss/ejb3/embedded/test";
+ URL url = Thread.currentThread().getContextClassLoader().getResource(p);
+ String s = url.toString();
+ return s.substring(0, s.length() - p.length());
+ }
+
+ @Test
+ public void test1() throws NamingException
+ {
+ InitialContext ctx = new InitialContext();
+ StatefulGreeter greeter = (StatefulGreeter) ctx.lookup("StatefulGreeterBean/local");
+ String now = new Date().toString();
+ greeter.setName(now);
+ String actual = greeter.sayHi();
+ assertEquals("Hi " + now, actual);
+ }
+}
More information about the jboss-cvs-commits
mailing list