[jboss-cvs] JBossAS SVN: r74062 - in projects/ejb3/trunk/core: src/main/java/org/jboss/ejb3/session and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 3 22:28:44 EDT 2008
Author: ALRubinger
Date: 2008-06-03 22:28:44 -0400 (Tue, 03 Jun 2008)
New Revision: 74062
Removed:
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/MetaDataHelper.java
Modified:
projects/ejb3/trunk/core/pom.xml
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionSpecContainer.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateless/unit/StatelessContainerTestCase.java
projects/ejb3/trunk/core/src/test/resources/basicbootstrap-beans.xml
Log:
[EJBTHREE-1390] Updated dependencies, updated Proxy integration tests
Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml 2008-06-04 02:27:33 UTC (rev 74061)
+++ projects/ejb3/trunk/core/pom.xml 2008-06-04 02:28:44 UTC (rev 74062)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>0.13.4-SNAPSHOT</version>
+ <version>0.13.7-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -56,13 +56,6 @@
<inherited>false</inherited>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- To make sure any static variables are flushed -->
- <forkMode>always</forkMode>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -226,7 +219,7 @@
<dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-remoting-aspects</artifactId>
- <version>1.0.0.Beta1</version>
+ <version>1.0.1.CR2</version>
</dependency>
<dependency>
@@ -280,7 +273,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-async</artifactId>
- <version>0.1.0</version>
+ <version>0.1.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -334,14 +327,14 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-test</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-transactions</artifactId>
- <version>0.13.0</version>
+ <version>0.13.1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionSpecContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionSpecContainer.java 2008-06-04 02:27:33 UTC (rev 74061)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionSpecContainer.java 2008-06-04 02:28:44 UTC (rev 74062)
@@ -19,6 +19,7 @@
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.annotation.LocalBinding;
import org.jboss.ejb3.annotation.RemoteBinding;
+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.interceptors.container.ContainerMethodInvocation;
@@ -121,11 +122,14 @@
// Initialize
String jndiRegistrarBindName = this.getJndiRegistrarBindName();
+ // Obtain Registrar
+ Ejb3Registrar registrar = Ejb3RegistrarLocator.locateRegistrar();
+
// Lookup
Object obj = null;
try
{
- obj = Ejb3RegistrarLocator.locateRegistrar().lookup(jndiRegistrarBindName);
+ obj = registrar.lookup(jndiRegistrarBindName);
}
// If not installed, warn and return null
catch (NotBoundException e)
@@ -137,10 +141,10 @@
}
// Cast
- JndiSessionRegistrarBase registrar = (JndiSessionRegistrarBase) obj;
+ JndiSessionRegistrarBase jndiRegistrar = (JndiSessionRegistrarBase) obj;
// Return
- return registrar;
+ return jndiRegistrar;
}
/**
Deleted: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/MetaDataHelper.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/MetaDataHelper.java 2008-06-04 02:27:33 UTC (rev 74061)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/MetaDataHelper.java 2008-06-04 02:28:44 UTC (rev 74062)
@@ -1,50 +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.core.test.common;
-
-import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
-import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-
-/**
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class MetaDataHelper
-{
- /**
- * Create an empty JBossSessionBeanMetaData to satisfy BeanInterceptorMetaDataBridge.
- *
- * @return
- */
- public static JBossSessionBeanMetaData createMockBeanMetaData()
- {
- JBossMetaData metaData = new JBossMetaData();
- JBossEnterpriseBeansMetaData enterpriseBeans = new JBossEnterpriseBeansMetaData();
- metaData.setEnterpriseBeans(enterpriseBeans);
- metaData.setAssemblyDescriptor(new JBossAssemblyDescriptorMetaData());
- JBossSessionBeanMetaData sessionBeanMetaData = new JBossSessionBeanMetaData();
- sessionBeanMetaData.setEnterpriseBeansMetaData(enterpriseBeans);
- return sessionBeanMetaData;
- }
-}
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateless/unit/StatelessContainerTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateless/unit/StatelessContainerTestCase.java 2008-06-04 02:27:33 UTC (rev 74061)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateless/unit/StatelessContainerTestCase.java 2008-06-04 02:28:44 UTC (rev 74062)
@@ -35,12 +35,14 @@
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.InitialContextFactory;
-import org.jboss.ejb3.core.test.common.MetaDataHelper;
+import org.jboss.ejb3.common.registrar.plugin.mc.Ejb3McRegistrar;
+import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
import org.jboss.ejb3.core.test.stateless.MyStateless;
import org.jboss.ejb3.core.test.stateless.MyStatelessBean;
import org.jboss.ejb3.stateless.StatelessContainer;
import org.jboss.ejb3.test.cachepassivation.MockDeploymentUnit;
import org.jboss.ejb3.test.cachepassivation.MockEjb3Deployment;
+import org.jboss.ejb3.test.common.MetaDataHelper;
import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.junit.AfterClass;
@@ -75,6 +77,10 @@
InitialContextFactory.close(null, null);
bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+
+ // Bind Registrar
+ Ejb3RegistrarLocator.bindRegistrar(new Ejb3McRegistrar(bootstrap.getKernel()));
+
deploy("basicbootstrap-beans.xml");
// TODO: AspectDeployment
@@ -104,19 +110,23 @@
ClassLoader cl = Thread.currentThread().getContextClassLoader();
System.out.println(cl.getResource("jndi.properties"));
String beanClassname = MyStatelessBean.class.getName();
- String ejbName = "MyStatelessBean";
+ String ejbName = MyStatelessBean.class.getSimpleName();
Domain domain = getDomain("Stateless Bean");
- Hashtable ctxProperties = null;
+ Hashtable<?,?> ctxProperties = null;
Ejb3Deployment deployment = new MockEjb3Deployment(new MockDeploymentUnit(), null);
- JBossSessionBeanMetaData beanMetaData = MetaDataHelper.createMockBeanMetaData();
+ JBossSessionBeanMetaData beanMetaData = MetaDataHelper.getMetadataFromBeanImplClass(MyStatelessBean.class);
StatelessContainer container = new StatelessContainer(cl, beanClassname, ejbName, domain, ctxProperties, deployment, beanMetaData);
// TODO: wickedness
container.instantiated();
- String serviceName = "jboss.ejb3:name=MyStatelessBean,service=EJB3";
- AbstractBeanMetaData bmd = new AbstractBeanMetaData(serviceName, StatelessContainer.class.getName());
- bootstrap.getKernel().getController().install(bmd, container);
+ // Register the Container in ObjectStore (MC)
+// String serviceName = "jboss.ejb3:name=MyStatelessBean,service=EJB3";
+// AbstractBeanMetaData bmd = new AbstractBeanMetaData(serviceName, StatelessContainer.class.getName());
+// bootstrap.getKernel().getController().install(bmd, container);
+ String containerName = container.getName();
+ Ejb3RegistrarLocator.locateRegistrar().bind(containerName, container);
+
InitialContext ctx = new InitialContext();
System.out.println("ctx = " + ctx);
@@ -126,6 +136,6 @@
String actual = bean.sayHi("Me");
assertEquals("Hi Me", actual);
- bootstrap.getKernel().getController().uninstall(serviceName);
+ bootstrap.getKernel().getController().uninstall(containerName);
}
}
Modified: projects/ejb3/trunk/core/src/test/resources/basicbootstrap-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/basicbootstrap-beans.xml 2008-06-04 02:27:33 UTC (rev 74061)
+++ projects/ejb3/trunk/core/src/test/resources/basicbootstrap-beans.xml 2008-06-04 02:28:44 UTC (rev 74062)
@@ -67,4 +67,51 @@
<depends>TransactionManager</depends>
</bean>
-->
+
+ <!--
+
+ JNDI Registrars
+
+
+ The JNDI Registrar is responsible for all JNDI Bindings for
+ an EJB. Its constructor takes the following arguments, in order:
+
+ javax.naming.Context (JNDI Context into which to bind objects)
+ org.jboss.ejb3.proxy.spi.registry.ProxyFactoryRegistry (Implementation of ProxyFactoryRegistry)
+ String statelessSessionProxyObjectFactoryType The JNDI ObjectFactory implementation to use for SLSB
+ ...more later when SFSB, @Service, MDB Implemented
+
+ -->
+
+ <!-- SLSB JNDI Registrar -->
+ <bean name="org.jboss.ejb3.JndiRegistrar.Session.SLSBJndiRegistrar"
+ class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatelessSessionRegistrar">
+ <constructor>
+ <parameter>
+ <inject bean="org.jboss.ejb3.JndiContext" />
+ </parameter>
+ <parameter>
+ org.jboss.ejb3.proxy.objectfactory.session.stateless.StatelessSessionProxyObjectFactory
+ </parameter>
+ </constructor>
+ <depends>NameServer</depends>
+ </bean>
+
+ <!-- SFSB JNDI Registrar -->
+ <bean name="org.jboss.ejb3.JndiRegistrar.Session.SFSBJndiRegistrar"
+ class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatefulSessionRegistrar">
+ <constructor>
+ <parameter>
+ <inject bean="org.jboss.ejb3.JndiContext" />
+ </parameter>
+ <parameter>
+ org.jboss.ejb3.proxy.objectfactory.session.stateful.StatefulSessionProxyObjectFactory
+ </parameter>
+ </constructor>
+ <depends>NameServer</depends>
+ </bean>
+
+ <!-- JNDI Registrar Configuration -->
+ <bean name="org.jboss.ejb3.JndiContext"
+ class="javax.naming.InitialContext" />
</deployment>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list