[jboss-cvs] JBossAS SVN: r79213 - in projects/ejb3/trunk/core/src/test: java/org/jboss/ejb3/core/test/regression/ejbthree1253/unit and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 7 07:04:16 EDT 2008
Author: wolfc
Date: 2008-10-07 07:04:16 -0400 (Tue, 07 Oct 2008)
New Revision: 79213
Added:
projects/ejb3/trunk/core/src/test/resources/connector-beans.xml
projects/ejb3/trunk/core/src/test/resources/namingserver-beans.xml
projects/ejb3/trunk/core/src/test/resources/org/
projects/ejb3/trunk/core/src/test/resources/org/jboss/
projects/ejb3/trunk/core/src/test/resources/org/jboss/ejb3/
projects/ejb3/trunk/core/src/test/resources/org/jboss/ejb3/core/
projects/ejb3/trunk/core/src/test/resources/org/jboss/ejb3/core/test/
projects/ejb3/trunk/core/src/test/resources/org/jboss/ejb3/core/test/regression/
projects/ejb3/trunk/core/src/test/resources/org/jboss/ejb3/core/test/regression/ejbthree1253/
projects/ejb3/trunk/core/src/test/resources/org/jboss/ejb3/core/test/regression/ejbthree1253/remoteproxyfactoryregistry-beans.xml
projects/ejb3/trunk/core/src/test/resources/statefulcontainer-beans.xml
projects/ejb3/trunk/core/src/test/resources/statelesscontainer-beans.xml
projects/ejb3/trunk/core/src/test/resources/transactionmanager-beans.xml
Modified:
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/regression/ejbthree1253/unit/OverriddenProxyFactoryTestCase.java
Log:
Do not boot the full VDF for each test
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java 2008-10-07 10:38:09 UTC (rev 79212)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java 2008-10-07 11:04:16 UTC (rev 79213)
@@ -22,7 +22,9 @@
package org.jboss.ejb3.core.test.common;
import java.net.URL;
+import java.util.ArrayList;
import java.util.Hashtable;
+import java.util.List;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -74,6 +76,8 @@
private static InitialContext initialContext;
+ private static List<SessionContainer> containers = new ArrayList<SessionContainer>();
+
/**
* Types of Containers Supported
*/
@@ -84,6 +88,10 @@
@AfterClass
public static void afterClass() throws Exception
{
+ for(SessionContainer container : containers)
+ unregisterContainer(container);
+ containers.clear();
+
if(initialContext != null)
initialContext.close();
initialContext = null;
@@ -115,7 +123,11 @@
Ejb3RegistrarLocator.bindRegistrar(new Ejb3McRegistrar(bootstrap.getKernel()));
}
- deploy("basicbootstrap-beans.xml");
+ deploy("namingserver-beans.xml");
+ deploy("transactionmanager-beans.xml");
+ deploy("statefulcontainer-beans.xml");
+ deploy("statelesscontainer-beans.xml");
+ deploy("connector-beans.xml");
// TODO: AspectDeployment
URL url = Thread.currentThread().getContextClassLoader().getResource("ejb3-interceptors-aop.xml");
@@ -127,7 +139,7 @@
initialContext = new InitialContext();
}
- private static void deploy(String resourceName)
+ protected static void deploy(String resourceName)
{
URL url = Thread.currentThread().getContextClassLoader().getResource(resourceName);
if (url == null)
@@ -222,6 +234,8 @@
// Deploy and register
registerContainer(container);
+ containers.add(container);
+
// Return
return container;
}
@@ -344,6 +358,8 @@
return;
unregisterContainer(container);
+
+ containers.remove(container);
}
private static void unregisterContainer(SessionContainer container)
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/regression/ejbthree1253/unit/OverriddenProxyFactoryTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/regression/ejbthree1253/unit/OverriddenProxyFactoryTestCase.java 2008-10-07 10:38:09 UTC (rev 79212)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/regression/ejbthree1253/unit/OverriddenProxyFactoryTestCase.java 2008-10-07 11:04:16 UTC (rev 79213)
@@ -98,6 +98,8 @@
public static void beforeClass() throws Exception
{
AbstractEJB3TestCase.beforeClass();
+
+ deploy("org/jboss/ejb3/core/test/regression/ejbthree1253/remoteproxyfactoryregistry-beans.xml");
}
@AfterClass
Added: projects/ejb3/trunk/core/src/test/resources/connector-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/connector-beans.xml (rev 0)
+++ projects/ejb3/trunk/core/src/test/resources/connector-beans.xml 2008-10-07 11:04:16 UTC (rev 79213)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <!-- REMOTING -->
+
+ <bean name="ServerConfiguration" class="org.jboss.remoting.ServerConfiguration">
+ <property name="invocationHandlers">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>AOP</key>
+ <value>org.jboss.aspects.remoting.AOPRemotingInvocationHandler</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean name="org.jboss.ejb3.RemotingConnector" class="org.jboss.remoting.transport.Connector">
+ <property name="invokerLocator">socket://0.0.0.0:3875</property>
+ <property name="serverConfiguration"><inject bean="ServerConfiguration"/></property>
+ </bean>
+</deployment>
\ No newline at end of file
Added: projects/ejb3/trunk/core/src/test/resources/namingserver-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/namingserver-beans.xml (rev 0)
+++ projects/ejb3/trunk/core/src/test/resources/namingserver-beans.xml 2008-10-07 11:04:16 UTC (rev 79213)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <!-- JNDI -->
+ <bean name="NamingServer" class="org.jnp.server.SingletonNamingServer"/>
+
+ <bean name="JavaCompInitializer" class="org.jboss.ejb3.core.test.common.JavaCompInitializer">
+ <depends>NamingServer</depends>
+ </bean>
+</deployment>
\ No newline at end of file
Added: projects/ejb3/trunk/core/src/test/resources/org/jboss/ejb3/core/test/regression/ejbthree1253/remoteproxyfactoryregistry-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/org/jboss/ejb3/core/test/regression/ejbthree1253/remoteproxyfactoryregistry-beans.xml (rev 0)
+++ projects/ejb3/trunk/core/src/test/resources/org/jboss/ejb3/core/test/regression/ejbthree1253/remoteproxyfactoryregistry-beans.xml 2008-10-07 11:04:16 UTC (rev 79213)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <!-- Remoting Proxy Factory Registry -->
+ <bean name="EJB3RemoteProxyFactoryRegistry" class="org.jboss.ejb3.proxy.factory.RemoteProxyFactoryRegistry">
+ <property name="factories">
+ <!-- Define each of the registered factories -->
+ <map class="java.util.HashMap" keyClass="java.lang.String"
+ valueClass="java.lang.Class">
+ <!-- RemoteProxyFactory -->
+ <entry>
+ <key>RemoteProxyFactory</key>
+ <value>org.jboss.ejb3.proxy.factory.RemoteProxyFactory</value>
+ </entry>
+ <!-- IORFactory -->
+ <!-- Only available in AS
+ <entry>
+ <key>IORFactory</key>
+ <value>org.jboss.ejb3.iiop.IORFactory</value>
+ </entry>
+ -->
+ <!-- ServiceRemoteProxyFactory -->
+ <entry>
+ <key>ServiceRemoteProxyFactory</key>
+ <value>org.jboss.ejb3.proxy.factory.service.ServiceRemoteProxyFactory</value>
+ </entry>
+ <!-- StatefulClusterProxyFactory -->
+ <entry>
+ <key>StatefulClusterProxyFactory</key>
+ <value>org.jboss.ejb3.proxy.factory.stateful.StatefulClusterProxyFactory</value>
+ </entry>
+ <!-- StatefulRemoteProxyFactory -->
+ <entry>
+ <key>StatefulRemoteProxyFactory</key>
+ <value>org.jboss.ejb3.proxy.factory.stateful.StatefulRemoteProxyFactory</value>
+ </entry>
+ <!-- StatelessClusterProxyFactory -->
+ <entry>
+ <key>StatelessClusterProxyFactory</key>
+ <value>org.jboss.ejb3.proxy.factory.stateless.StatelessClusterProxyFactory</value>
+ </entry>
+ <!-- StatelessRemoteProxyFactory -->
+ <entry>
+ <key>StatelessRemoteProxyFactory</key>
+ <value>org.jboss.ejb3.proxy.factory.stateless.StatelessRemoteProxyFactory</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+</deployment>
\ No newline at end of file
Added: projects/ejb3/trunk/core/src/test/resources/statefulcontainer-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/statefulcontainer-beans.xml (rev 0)
+++ projects/ejb3/trunk/core/src/test/resources/statefulcontainer-beans.xml 2008-10-07 11:04:16 UTC (rev 79213)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <!-- EJB3 Persistence Manager Factory Registry -->
+ <bean name="EJB3PersistenceManagerFactoryRegistry" class="org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry">
+ <property name="factories">
+ <!-- Define each of the registered factories -->
+ <map class="java.util.HashMap" keyClass="java.lang.String"
+ valueClass="java.lang.Class">
+ <!-- StatefulSessionFilePersistenceManager -->
+ <entry>
+ <key>StatefulSessionFilePersistenceManager</key>
+ <!-- A dummy persistence manager which doesn't rely on the jboss mbean -->
+ <value>org.jboss.ejb3.test.cachepassivation.MyStatefulSessionFilePersistenceManagerFactory</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <!-- SFSB JNDI Registrar -->
+ <bean name="org.jboss.ejb3.JndiRegistrar.Session.SFSBJndiRegistrar"
+ class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatefulSessionRegistrar">
+ <constructor>
+ <parameter>
+ org.jboss.ejb3.proxy.objectfactory.session.stateful.StatefulSessionProxyObjectFactory
+ </parameter>
+ </constructor>
+ <depends>NamingServer</depends>
+ </bean>
+</deployment>
\ No newline at end of file
Added: projects/ejb3/trunk/core/src/test/resources/statelesscontainer-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/statelesscontainer-beans.xml (rev 0)
+++ projects/ejb3/trunk/core/src/test/resources/statelesscontainer-beans.xml 2008-10-07 11:04:16 UTC (rev 79213)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <!-- SLSB JNDI Registrar -->
+ <bean name="org.jboss.ejb3.JndiRegistrar.Session.SLSBJndiRegistrar"
+ class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatelessSessionRegistrar">
+ <constructor>
+ <parameter>
+ org.jboss.ejb3.proxy.objectfactory.session.stateless.StatelessSessionProxyObjectFactory
+ </parameter>
+ </constructor>
+ <depends>NamingServer</depends>
+ </bean>
+</deployment>
\ No newline at end of file
Added: projects/ejb3/trunk/core/src/test/resources/transactionmanager-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/transactionmanager-beans.xml (rev 0)
+++ projects/ejb3/trunk/core/src/test/resources/transactionmanager-beans.xml 2008-10-07 11:04:16 UTC (rev 79213)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <!-- JTA -->
+ <bean name="TransactionManager" class="org.jboss.ejb3.core.test.common.SimpleTransactionService">
+ <depends>NamingServer</depends>
+ </bean>
+</deployment>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list