[jboss-cvs] JBossAS SVN: r87854 - in projects/ejb3/trunk/embedded: src/main/java/org/jboss/ejb3/embedded and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 27 05:56:51 EDT 2009
Author: wolfc
Date: 2009-04-27 05:56:50 -0400 (Mon, 27 Apr 2009)
New Revision: 87854
Added:
projects/ejb3/trunk/embedded/src/main/resources/conf/
projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap.xml
projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap/
projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap/aop.xml
projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap/classloader.xml
projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap/deployers.xml
projects/ejb3/trunk/embedded/src/main/resources/deploy/
projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb-container-beans.xml
projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb-deployers-beans.xml
projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb3-connectors-jboss-beans.xml
projects/ejb3/trunk/embedded/src/main/resources/deploy/jpa-deployers-beans.xml
projects/ejb3/trunk/embedded/src/main/resources/deploy/namingserver-beans.xml
projects/ejb3/trunk/embedded/src/main/resources/deploy/transactionmanager-beans.xml
Removed:
projects/ejb3/trunk/embedded/src/main/resources/META-INF/aop-beans.xml
projects/ejb3/trunk/embedded/src/main/resources/META-INF/classloader-beans.xml
projects/ejb3/trunk/embedded/src/main/resources/META-INF/ejb-container-beans.xml
projects/ejb3/trunk/embedded/src/main/resources/META-INF/ejb-deployers-beans.xml
projects/ejb3/trunk/embedded/src/main/resources/META-INF/ejb3-connectors-jboss-beans.xml
projects/ejb3/trunk/embedded/src/main/resources/META-INF/embedded-bootstrap-beans.xml
projects/ejb3/trunk/embedded/src/main/resources/META-INF/jpa-deployers-beans.xml
projects/ejb3/trunk/embedded/src/main/resources/META-INF/namingserver-beans.xml
projects/ejb3/trunk/embedded/src/main/resources/META-INF/transactionmanager-beans.xml
Modified:
projects/ejb3/trunk/embedded/pom.xml
projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainer.java
Log:
EJBTHREE-1811: use Bootstrap 0.1.1, moved vdf stuff to bootstrap and created deploy directory for other stuff
Modified: projects/ejb3/trunk/embedded/pom.xml
===================================================================
--- projects/ejb3/trunk/embedded/pom.xml 2009-04-27 09:32:49 UTC (rev 87853)
+++ projects/ejb3/trunk/embedded/pom.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -175,6 +175,11 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-impl-mc</artifactId>
+ <version>0.1.1</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-api</artifactId>
<version>3.1.0-SNAPSHOT</version>
@@ -270,10 +275,6 @@
<version>${version.org.jboss.microcontainer}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.naming</groupId>
<artifactId>jnpserver</artifactId>
<version>5.0.1.GA</version>
Modified: projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainer.java
===================================================================
--- projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainer.java 2009-04-27 09:32:49 UTC (rev 87853)
+++ projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainer.java 2009-04-27 09:56:50 UTC (rev 87854)
@@ -24,10 +24,18 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import javax.ejb.EJBContainer;
+import org.jboss.bootstrap.spi.mc.config.MCServerConfig;
+import org.jboss.bootstrap.spi.mc.config.MCServerConfigFactory;
+import org.jboss.bootstrap.spi.mc.server.MCServer;
+import org.jboss.bootstrap.spi.mc.server.MCServerFactory;
+import org.jboss.classloader.spi.ClassLoaderSystem;
+import org.jboss.classloading.spi.vfs.policy.VFSClassLoaderPolicy;
import org.jboss.dependency.spi.Controller;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.deployers.client.spi.Deployment;
@@ -37,11 +45,8 @@
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.ejb3.api.spi.EJBContainerWrapper;
import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
-import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.kernel.spi.deployment.KernelDeployment;
import org.jboss.logging.Logger;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
@@ -54,14 +59,14 @@
{
private static final Logger log = Logger.getLogger(JBossEJBContainer.class);
- private ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-
+ // stage 0
+ private ClassLoader classLoader;
+
// stage 1
- private BasicBootstrap bootstrap = new BasicBootstrap();
- private Kernel kernel;
- private BasicXMLDeployer deployer;
+ private MCServer server;
// stage 2
+ private Kernel kernel;
private MainDeployer mainDeployer;
public static JBossEJBContainer on(EJBContainer container)
@@ -79,37 +84,38 @@
{
try
{
- bootstrap.run();
- kernel = bootstrap.getKernel();
- deployer = new BasicXMLDeployer(kernel);
-
- deploy("META-INF/classloader-beans.xml", true);
-
- // bring the main deployer online
- deploy("META-INF/embedded-bootstrap-beans.xml", true);
-
- // we're at stage 2
- mainDeployer = getBean("MainDeployer", ControllerState.INSTALLED, MainDeployer.class);
-
- deploy("META-INF/ejb-deployers-beans.xml", false);
-
- deploy("META-INF/namingserver-beans.xml", true);
-
- deploy("META-INF/aop-beans.xml", true);
-
- deploy("META-INF/transactionmanager-beans.xml", true);
-
- deploy("META-INF/jpa-deployers-beans.xml", true);
-
- deploy("META-INF/ejb-container-beans.xml", true);
-
- deploy("META-INF/ejb3-connectors-jboss-beans.xml", true);
-
- deployer.validate();
-
- deployMain("ejb3-interceptors-aop.xml");
-
- deployModules(modules);
+ VirtualFile roots[] = { };
+ classLoader = ClassLoaderSystem.getInstance().registerClassLoaderPolicy(VFSClassLoaderPolicy.createVFSClassLoaderPolicy("preboot-cl", roots));
+ URL confURL = classLoader.getResource("conf");
+ if(confURL == null)
+ throw new IllegalStateException("can't find a 'conf' directory on the classpath of " + classLoader);
+ MCServerConfig config = MCServerConfigFactory.createServerConfig(classLoader);
+ // To Bootstrap the home is where bootstrap.xml lives
+ config.bootstrapHome(confURL);
+ MCServer server = MCServerFactory.createServer(classLoader);
+ server.setConfiguration(config);
+ server.initialize();
+ ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
+ Thread.currentThread().setContextClassLoader(classLoader);
+ try
+ {
+ server.start();
+
+ // we're at stage 2
+ kernel = server.getKernel();
+ mainDeployer = getBean("MainDeployer", ControllerState.INSTALLED, MainDeployer.class);
+
+ deployDeployDirectory();
+
+ // TODO: I need a cunning plan
+ deployMain("ejb3-interceptors-aop.xml");
+
+ deployModules(modules);
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(oldCl);
+ }
}
catch(Throwable t)
{
@@ -121,20 +127,34 @@
@Override
public void close()
{
+ // TODO: why does this not happen on mainDeployer.stop?
if(mainDeployer != null)
{
mainDeployer.prepareShutdown();
mainDeployer.shutdown();
mainDeployer = null;
}
-
- if(deployer != null)
+
+ if(server != null)
{
- deployer.shutdown();
- deployer = null;
+ within(classLoader, new Runnable() {
+ public void run()
+ {
+ try
+ {
+ server.shutdown();
+ }
+ catch(Exception e)
+ {
+ log.warn("Failed to shutdown server " + server, e);
+ }
+ }
+ });
}
+
kernel = null;
- bootstrap = null;
+
+ ClassLoaderSystem.getInstance().unregisterClassLoader(classLoader);
}
private Deployment deploy(Deployment deployment) throws DeploymentException
@@ -153,11 +173,6 @@
}
}
- private KernelDeployment deploy(String name, boolean validate) throws Throwable
- {
- return deployKernel(getResource(name), validate);
- }
-
public Deployment deploy(URL url) throws DeploymentException, IOException
{
VirtualFile root = VFS.getRoot(url);
@@ -165,15 +180,27 @@
return deploy(deployment);
}
- private KernelDeployment deployKernel(URL url, boolean validate) throws Throwable
+ protected void deployDeployDirectory() throws DeploymentException, IOException
{
- log.info("Deploying " + url);
- KernelDeployment deployment = deployer.deploy(url);
- if(validate)
- deployer.validate(deployment);
- return deployment;
+ URL deployDirURL = classLoader.getResource("deploy");
+ if(deployDirURL == null)
+ {
+ // We can function without it, but to what extend?
+ log.warn("Can't find a deploy directory resource on class loader " + classLoader);
+ return;
+ }
+
+ List<Deployment> deployments = new ArrayList<Deployment>();
+ VirtualFile deployDir = VFS.getRoot(deployDirURL);
+ for(VirtualFile child : deployDir.getChildren())
+ {
+ VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(child);
+ log.info("Deploying " + deployment.getName());
+ deployments.add(deployment);
+ }
+ mainDeployer.deploy(deployments.toArray(new Deployment[0]));
}
-
+
private void deployMain(String name) throws DeploymentException, IllegalArgumentException, MalformedURLException, IOException
{
URL url = getResource(name);
@@ -264,4 +291,17 @@
throw new IllegalStateException("Bean not found " + name + " at state " + state + " in controller " + controller);
}
+ private static void within(ClassLoader cl, Runnable task)
+ {
+ ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
+ try
+ {
+ Thread.currentThread().setContextClassLoader(cl);
+ task.run();
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(oldCL);
+ }
+ }
}
Deleted: projects/ejb3/trunk/embedded/src/main/resources/META-INF/aop-beans.xml
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/META-INF/aop-beans.xml 2009-04-27 09:32:49 UTC (rev 87853)
+++ projects/ejb3/trunk/embedded/src/main/resources/META-INF/aop-beans.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!--
- <classloader><inject bean="aop-classloader:0.0.0"/></classloader>
-
- <classloader name="aop-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"/>
- -->
-
- <bean name="AspectManager" class="org.jboss.aop.AspectManager">
- <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
- </bean>
-
- <bean name="AspectAppParsingDeployer" class="org.jboss.aop.deployers.AspectAppParsingDeployer"/>
- <bean name="AspectDeployer" class="org.jboss.aop.deployers.AspectDeployer">
- <property name="aspectManager"><inject bean="AspectManager"/></property>
- </bean>
-</deployment>
\ No newline at end of file
Deleted: projects/ejb3/trunk/embedded/src/main/resources/META-INF/classloader-beans.xml
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/META-INF/classloader-beans.xml 2009-04-27 09:32:49 UTC (rev 87853)
+++ projects/ejb3/trunk/embedded/src/main/resources/META-INF/classloader-beans.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- The core classloading system
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <classloader><inject bean="bootstrap-classloader:0.0.0"/></classloader>
-
- <!--
- The classloader implementation
- -->
- <bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
- <classloader><null/></classloader>
- <constructor factoryClass="org.jboss.classloader.spi.ClassLoaderSystem" factoryMethod="getInstance"/>
- </bean>
-
- <!--
- ClassLoader management and resolution
- -->
- <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
- <classloader><null/></classloader>
- <incallback method="addModule" state="Configured"/>
- <uncallback method="removeModule" state="Configured"/>
- </bean>
-
- <classloader name="bootstrap-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
- <!-- System -->
- <!-- root>${jboss.lib.url}jboss-system.jar</root -->
- </classloader>
-
-</deployment>
Deleted: projects/ejb3/trunk/embedded/src/main/resources/META-INF/ejb-container-beans.xml
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/META-INF/ejb-container-beans.xml 2009-04-27 09:32:49 UTC (rev 87853)
+++ projects/ejb3/trunk/embedded/src/main/resources/META-INF/ejb-container-beans.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- The provider for EJB3 UserTransactions -->
- <bean name="EJB3UserTransactionprovider" class="org.jboss.ejb3.tx.EJB3UserTransactionProvider">
- <constructor factoryClass="org.jboss.ejb3.tx.EJB3UserTransactionProvider" factoryMethod="getSingleton"/>
- </bean>
-
- <bean name="EmbeddedCachedConnectionManagerBridge" class="org.jboss.ejb3.embedded.connectionmanager.EmbeddedCachedConnectionManager"/>
-
- <bean name="EmbeddedXPCResolver" class="org.jboss.ejb3.stateful.EJB3XPCResolver"/>
-</deployment>
Deleted: projects/ejb3/trunk/embedded/src/main/resources/META-INF/ejb-deployers-beans.xml
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/META-INF/ejb-deployers-beans.xml 2009-04-27 09:32:49 UTC (rev 87853)
+++ projects/ejb3/trunk/embedded/src/main/resources/META-INF/ejb-deployers-beans.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!--
- <classloader><inject bean="ejb-deployers-classloader:0.0.0"/></classloader>
-
- <classloader name="ejb-deployers-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"/>
- -->
-
- <!-- TODO: move SchemaResolverConfig to a more general beans.xml -->
- <bean name="SchemaResolverConfig" class="org.jboss.xb.binding.sunday.unmarshalling.SchemaResolverConfig">
- <property name="bindingClassesByLocations">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>ejb-jar_3_0.xsd</key>
- <value>org.jboss.metadata.ejb.spec.EjbJar30MetaData</value>
- </entry>
- <entry>
- <key>jboss_5_0.xsd</key>
- <value>org.jboss.metadata.ejb.jboss.JBoss50MetaData</value>
- </entry>
- <entry>
- <key>persistence_1_0.xsd</key>
- <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
- </entry>
- </map>
- </property>
- </bean>
-
- <!-- Deployer which parses the ejb-jar.xml -->
- <bean name="EjbParsingDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
-
- <constructor>
- <parameter class="java.lang.Class">org.jboss.metadata.ejb.spec.EjbJarMetaData</parameter>
- </constructor>
- <property name="name">ejb-jar.xml</property>
- <!-- We need to be fast, so no schema validation -->
- <property name="useSchemaValidation">false</property>
- </bean>
-
- <!-- Deployer which parses jboss.xml -->
- <bean name="JBossEjbParsingDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
-
- <constructor>
- <parameter class="java.lang.Class">org.jboss.metadata.ejb.jboss.JBossMetaData</parameter>
- </constructor>
- <property name="name">jboss.xml</property>
- <!-- We need to be fast, so no schema validation -->
- <property name="useSchemaValidation">false</property>
- </bean>
-
-
- <bean name="EjbAnnotationMetaDataDeployer" class="org.jboss.ejb3.deployers.EjbAnnotationMetaDataDeployer"/>
-
- <bean name="MergedJBossMetaDataDeployer" class="org.jboss.ejb3.deployers.MergedJBossMetaDataDeployer"/>
-
- <bean name="EjbMetadataJndiPolicyDecoratorDeployer" class="org.jboss.ejb3.deployers.EjbMetadataJndiPolicyDecoratorDeployer"/>
-
- <!-- EJB3 ProcessorChain Deployer -->
- <bean name="Ejb3MetadataProcessingDeployer" class="org.jboss.ejb3.deployers.Ejb3MetadataProcessingDeployer" />
-
- <bean name="EjbModuleDeployer" class="org.jboss.ejb3.embedded.deployers.EjbModuleDeployer"/>
- <bean name="EjbComponentDeployer" class="org.jboss.ejb3.embedded.deployers.EjbComponentDeployer">
- <depends>org.jboss.ejb3.RemotingConnector</depends>
- </bean>
-
- <bean name="MessageDestinationReferenceResolver" class="org.jboss.ejb3.embedded.resolvers.EmbeddedMessageDestinationReferenceResolver"/>
-
- <!-- EJB3 Cache Factory Registry -->
- <bean name="EJB3CacheFactoryRegistry" class="org.jboss.ejb3.cache.CacheFactoryRegistry">
- <property name="factories">
- <!-- Define each of the registered factories -->
- <map class="java.util.HashMap" keyClass="java.lang.String"
- valueClass="java.lang.Class">
- <!-- NoPassivationCache -->
- <entry>
- <key>NoPassivationCache</key>
- <value>org.jboss.ejb3.cache.NoPassivationCacheFactory</value>
- </entry>
- <!-- SimpleStatefulCache -->
- <entry>
- <key>SimpleStatefulCache</key>
- <value>org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory</value>
- </entry>
- <!-- StatefulTreeCache -->
- <entry>
- <key>StatefulTreeCache</key>
- <value>org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory</value>
- </entry>
- </map>
- </property>
- </bean>
-
- <!-- 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>
- <value>org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManagerFactory</value>
- </entry>
- </map>
- </property>
- </bean>
-
- <!-- EJB3 Pool Factory Registry -->
- <bean name="EJB3PoolFactoryRegistry" class="org.jboss.ejb3.pool.PoolFactoryRegistry">
- <property name="factories">
- <!-- Define each of the registered factories -->
- <map class="java.util.HashMap" keyClass="java.lang.String"
- valueClass="java.lang.Class">
- <!-- ThreadlocalPool -->
- <entry>
- <key>ThreadlocalPool</key>
- <value>org.jboss.ejb3.pool.ThreadlocalPoolFactory</value>
- </entry>
- <!-- StrictMaxPool -->
- <entry>
- <key>StrictMaxPool</key>
- <value>org.jboss.ejb3.pool.StrictMaxPoolFactory</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>
- </bean>
-
- <!-- 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>
- </bean>
-
- <!-- We could have directly used the org.jboss.ejb3.Ejb3Registry as a MC bean
- and added the "register" and "unregister" methods as callbacks, but since
- those methods are "static", MC complains and throws exception. So let's use
- this indirection for the time being.
-
- The Ejb3Registry is looked up by the IsLocalInterceptor for EJB containers.
- -->
-
- <bean name="EJB3ComponentRegistry" class="org.jboss.ejb3.embedded.Ejb3ComponentRegistry">
- <!-- Accept any implementor of org.jboss.ejb3.EJBContainer -->
- <incallback method="addContainer"/>
- <uncallback method="removeContainer"/>
- </bean>
-
-</deployment>
\ No newline at end of file
Deleted: projects/ejb3/trunk/embedded/src/main/resources/META-INF/ejb3-connectors-jboss-beans.xml
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/META-INF/ejb3-connectors-jboss-beans.xml 2009-04-27 09:32:49 UTC (rev 87853)
+++ projects/ejb3/trunk/embedded/src/main/resources/META-INF/ejb3-connectors-jboss-beans.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- EJB3 Connectors
-
--->
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!--
-
- JBoss Remoting Connector
-
- Note: Bean Name "org.jboss.ejb3.RemotingConnector" is used
- as a lookup value; alter only after checking java references
- to this key.
-
- -->
- <bean name="org.jboss.ejb3.RemotingConnector"
- class="org.jboss.remoting.transport.Connector">
-
- <!-- Not using Service Binding Manager, for now, in ejb3-embedded -->
- <property name="invokerLocator">socket://0.0.0.0/3873</property>
-
- <property name="serverConfiguration">
- <inject bean="ServerConfiguration" />
- </property>
- </bean>
-
- <!-- Remoting Server Configuration -->
- <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>
-
-</deployment>
\ No newline at end of file
Deleted: projects/ejb3/trunk/embedded/src/main/resources/META-INF/embedded-bootstrap-beans.xml
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/META-INF/embedded-bootstrap-beans.xml 2009-04-27 09:32:49 UTC (rev 87853)
+++ projects/ejb3/trunk/embedded/src/main/resources/META-INF/embedded-bootstrap-beans.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!--
- <bean name="SimpleClassLoaderDeployer" class="org.jboss.ejb3.embedded.deployers.SimpleClassLoaderDeployer"/>
- -->
- <classloader><inject bean="embedded-bootstrap-classloader:0.0.0"/></classloader>
-
- <classloader name="embedded-bootstrap-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"/>
-
- <!-- The MainDeployer -->
- <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
- <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
- <property name="deployers"><inject bean="Deployers"/></property>
- <!--property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property-->
- </bean>
-
- <!-- The holder for deployers that determine structure -->
- <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
- <property name="structureBuilder">
- <!-- The consolidator of the structure information -->
- <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/>
- </property>
- <!-- Accept any implementor of structure deployer -->
- <incallback method="addDeployer"/>
- <uncallback method="removeDeployer"/>
- </bean>
-
- <!-- The holder for deployers that do real deployment -->
- <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
- <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
- <!-- Accept any implementor of deployer -->
- <incallback method="addDeployer"/>
- <uncallback method="removeDeployer"/>
- </bean>
-
- <!-- File Structure -->
- <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure"/>
-
- <!-- File Structure -->
- <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure"/>
-
- <!-- POJO Deployment -->
- <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer"/>
- <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"/>
- <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
- <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
- </bean>
-
- <!-- Classloader deployers -->
- <bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
- <constructor>
- <parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter>
- </constructor>
- <property name="name">jboss-classloading.xml</property>
- <property name="buildManagedObject">true</property>
- </bean>
- <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer">
- <property name="defaultMetaData">
- <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/>
- </property>
- </bean>
- <bean name="InMemoryClassesDeployer" class="org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer"/>
- <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
- <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
- <property name="classLoading"><inject bean="ClassLoading"/></property>
- </bean>
- <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
- <property name="classLoading"><inject bean="ClassLoading"/></property>
- <property name="system"><inject bean="ClassLoaderSystem"/></property>
- </bean>
-</deployment>
Deleted: projects/ejb3/trunk/embedded/src/main/resources/META-INF/jpa-deployers-beans.xml
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/META-INF/jpa-deployers-beans.xml 2009-04-27 09:32:49 UTC (rev 87853)
+++ projects/ejb3/trunk/embedded/src/main/resources/META-INF/jpa-deployers-beans.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="DataSourceDependencyResolver" class="org.jboss.ejb3.embedded.resolvers.EmbeddedDataSourceDependencyResolver"/>
-
- <bean name="JavaEEModuleInformer" class="org.jboss.ejb3.embedded.javaee.SimpleJavaEEModuleInformer"/>
-
- <bean name="SpecCompliantSearchStrategy" class="org.jboss.jpa.resolvers.strategy.SpecCompliantSearchStrategy"/>
-
- <!-- DefaultPersistenceUnitDependencyResolver for spec compliant resolving. Uses SpecCompliantSearchStrategy-->
- <bean name="PersistenceUnitDependencyResolver" class="org.jboss.jpa.resolvers.DefaultPersistenceUnitDependencyResolver"/>
-
- <bean name="PersistenceParsingDeployer" class="org.jboss.jpa.deployers.PersistenceParsingDeployer"/>
-
- <bean name="PersistenceDeployer" class="org.jboss.jpa.deployers.PersistenceDeployer"/>
- <bean name="PersistenceUnitDeployer" class="org.jboss.jpa.deployers.PersistenceUnitDeployer">
- <property name="defaultPersistenceProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>hibernate.transaction.manager_lookup_class</key>
- <value>org.hibernate.transaction.JBossTransactionManagerLookup</value>
- </entry>
- </map>
- </property>
- </bean>
-</deployment>
\ No newline at end of file
Deleted: projects/ejb3/trunk/embedded/src/main/resources/META-INF/namingserver-beans.xml
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/META-INF/namingserver-beans.xml 2009-04-27 09:32:49 UTC (rev 87853)
+++ projects/ejb3/trunk/embedded/src/main/resources/META-INF/namingserver-beans.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -1,9 +0,0 @@
-<?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.naming.JavaCompInitializer">
- <depends>NamingServer</depends>
- </bean>
-</deployment>
\ No newline at end of file
Deleted: projects/ejb3/trunk/embedded/src/main/resources/META-INF/transactionmanager-beans.xml
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/META-INF/transactionmanager-beans.xml 2009-04-27 09:32:49 UTC (rev 87853)
+++ projects/ejb3/trunk/embedded/src/main/resources/META-INF/transactionmanager-beans.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- JTA -->
- <bean name="TransactionManager" class="org.jboss.ejb3.embedded.service.SimpleTransactionService">
- <depends>NamingServer</depends>
- </bean>
-
- <bean name="RealTransactionManager">
- <constructor factoryMethod="getTransactionManager">
- <factory bean="TransactionManager"/>
- </constructor>
- </bean>
-</deployment>
Copied: projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap/aop.xml (from rev 87850, projects/ejb3/trunk/embedded/src/main/resources/META-INF/aop-beans.xml)
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap/aop.xml (rev 0)
+++ projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap/aop.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <!--
+ <classloader><inject bean="aop-classloader:0.0.0"/></classloader>
+
+ <classloader name="aop-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"/>
+ -->
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <bean name="AspectAppParsingDeployer" class="org.jboss.aop.deployers.AspectAppParsingDeployer"/>
+ <bean name="AspectDeployer" class="org.jboss.aop.deployers.AspectDeployer">
+ <property name="aspectManager"><inject bean="AspectManager"/></property>
+ </bean>
+</deployment>
\ No newline at end of file
Property changes on: projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap/aop.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap/classloader.xml (from rev 87850, projects/ejb3/trunk/embedded/src/main/resources/META-INF/classloader-beans.xml)
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap/classloader.xml (rev 0)
+++ projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap/classloader.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The core classloading system
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="bootstrap-classloader:0.0.0"/></classloader>
+
+ <!--
+ The classloader implementation
+ -->
+ <bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
+ <classloader><null/></classloader>
+ <constructor factoryClass="org.jboss.classloader.spi.ClassLoaderSystem" factoryMethod="getInstance"/>
+ </bean>
+
+ <!--
+ ClassLoader management and resolution
+ -->
+ <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
+ <classloader><null/></classloader>
+ <incallback method="addModule" state="Configured"/>
+ <uncallback method="removeModule" state="Configured"/>
+ </bean>
+
+ <classloader name="bootstrap-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <!-- System -->
+ <!-- root>${jboss.lib.url}jboss-system.jar</root -->
+ </classloader>
+
+</deployment>
Property changes on: projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap/classloader.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap/deployers.xml (from rev 87850, projects/ejb3/trunk/embedded/src/main/resources/META-INF/embedded-bootstrap-beans.xml)
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap/deployers.xml (rev 0)
+++ projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap/deployers.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <classloader><inject bean="deployers-classloader:0.0.0"/></classloader>
+
+ <classloader name="deployers-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"/>
+
+ <!-- The MainDeployer -->
+ <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
+ <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
+ <property name="deployers"><inject bean="Deployers"/></property>
+ <!--property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property-->
+ </bean>
+
+ <!-- The holder for deployers that determine structure -->
+ <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
+ <property name="structureBuilder">
+ <!-- The consolidator of the structure information -->
+ <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/>
+ </property>
+ <!-- Accept any implementor of structure deployer -->
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ </bean>
+
+ <!-- The holder for deployers that do real deployment -->
+ <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
+ <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
+ <!-- Accept any implementor of deployer -->
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ </bean>
+
+ <!-- File Structure -->
+ <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure"/>
+
+ <!-- File Structure -->
+ <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure"/>
+
+ <!-- POJO Deployment -->
+ <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer"/>
+ <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"/>
+ <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
+ <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
+ </bean>
+
+ <!-- Classloader deployers -->
+ <bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+ <constructor>
+ <parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter>
+ </constructor>
+ <property name="name">jboss-classloading.xml</property>
+ <property name="buildManagedObject">true</property>
+ </bean>
+ <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer">
+ <property name="defaultMetaData">
+ <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/>
+ </property>
+ </bean>
+ <bean name="InMemoryClassesDeployer" class="org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer"/>
+ <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
+ <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
+ <property name="classLoading"><inject bean="ClassLoading"/></property>
+ </bean>
+ <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
+ <property name="classLoading"><inject bean="ClassLoading"/></property>
+ <property name="system"><inject bean="ClassLoaderSystem"/></property>
+ </bean>
+</deployment>
Property changes on: projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap/deployers.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Added: projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap.xml
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap.xml (rev 0)
+++ projects/ejb3/trunk/embedded/src/main/resources/conf/bootstrap.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ The list of URLs for mc beans to load during bootstrap.
+-->
+<bootstrap xmlns="urn:jboss:bootstrap:1.0">
+
+ <!--
+ <url>bootstrap/logging.xml</url>
+ <url>bootstrap/vfs.xml</url>
+ -->
+ <url>bootstrap/classloader.xml</url>
+ <url>bootstrap/aop.xml</url>
+ <!--
+ <url>bootstrap/jmx.xml</url>
+ -->
+ <url>bootstrap/deployers.xml</url>
+ <!--
+ <url>bootstrap/bindings.xml</url>
+ <url>bootstrap/profile-6.xml</url>
+ -->
+
+</bootstrap>
\ No newline at end of file
Copied: projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb-container-beans.xml (from rev 87850, projects/ejb3/trunk/embedded/src/main/resources/META-INF/ejb-container-beans.xml)
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb-container-beans.xml (rev 0)
+++ projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb-container-beans.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <!-- The provider for EJB3 UserTransactions -->
+ <bean name="EJB3UserTransactionprovider" class="org.jboss.ejb3.tx.EJB3UserTransactionProvider">
+ <constructor factoryClass="org.jboss.ejb3.tx.EJB3UserTransactionProvider" factoryMethod="getSingleton"/>
+ </bean>
+
+ <bean name="EmbeddedCachedConnectionManagerBridge" class="org.jboss.ejb3.embedded.connectionmanager.EmbeddedCachedConnectionManager"/>
+
+ <bean name="EmbeddedXPCResolver" class="org.jboss.ejb3.stateful.EJB3XPCResolver"/>
+</deployment>
Property changes on: projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb-container-beans.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb-deployers-beans.xml (from rev 87850, projects/ejb3/trunk/embedded/src/main/resources/META-INF/ejb-deployers-beans.xml)
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb-deployers-beans.xml (rev 0)
+++ projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb-deployers-beans.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <!--
+ <classloader><inject bean="ejb-deployers-classloader:0.0.0"/></classloader>
+
+ <classloader name="ejb-deployers-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"/>
+ -->
+
+ <!-- TODO: move SchemaResolverConfig to a more general beans.xml -->
+ <bean name="SchemaResolverConfig" class="org.jboss.xb.binding.sunday.unmarshalling.SchemaResolverConfig">
+ <property name="bindingClassesByLocations">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>ejb-jar_3_0.xsd</key>
+ <value>org.jboss.metadata.ejb.spec.EjbJar30MetaData</value>
+ </entry>
+ <entry>
+ <key>jboss_5_0.xsd</key>
+ <value>org.jboss.metadata.ejb.jboss.JBoss50MetaData</value>
+ </entry>
+ <entry>
+ <key>persistence_1_0.xsd</key>
+ <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <!-- Deployer which parses the ejb-jar.xml -->
+ <bean name="EjbParsingDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+
+ <constructor>
+ <parameter class="java.lang.Class">org.jboss.metadata.ejb.spec.EjbJarMetaData</parameter>
+ </constructor>
+ <property name="name">ejb-jar.xml</property>
+ <!-- We need to be fast, so no schema validation -->
+ <property name="useSchemaValidation">false</property>
+ </bean>
+
+ <!-- Deployer which parses jboss.xml -->
+ <bean name="JBossEjbParsingDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+
+ <constructor>
+ <parameter class="java.lang.Class">org.jboss.metadata.ejb.jboss.JBossMetaData</parameter>
+ </constructor>
+ <property name="name">jboss.xml</property>
+ <!-- We need to be fast, so no schema validation -->
+ <property name="useSchemaValidation">false</property>
+ </bean>
+
+
+ <bean name="EjbAnnotationMetaDataDeployer" class="org.jboss.ejb3.deployers.EjbAnnotationMetaDataDeployer"/>
+
+ <bean name="MergedJBossMetaDataDeployer" class="org.jboss.ejb3.deployers.MergedJBossMetaDataDeployer"/>
+
+ <bean name="EjbMetadataJndiPolicyDecoratorDeployer" class="org.jboss.ejb3.deployers.EjbMetadataJndiPolicyDecoratorDeployer"/>
+
+ <!-- EJB3 ProcessorChain Deployer -->
+ <bean name="Ejb3MetadataProcessingDeployer" class="org.jboss.ejb3.deployers.Ejb3MetadataProcessingDeployer" />
+
+ <bean name="EjbModuleDeployer" class="org.jboss.ejb3.embedded.deployers.EjbModuleDeployer"/>
+ <bean name="EjbComponentDeployer" class="org.jboss.ejb3.embedded.deployers.EjbComponentDeployer">
+ <depends>org.jboss.ejb3.RemotingConnector</depends>
+ </bean>
+
+ <bean name="MessageDestinationReferenceResolver" class="org.jboss.ejb3.embedded.resolvers.EmbeddedMessageDestinationReferenceResolver"/>
+
+ <!-- EJB3 Cache Factory Registry -->
+ <bean name="EJB3CacheFactoryRegistry" class="org.jboss.ejb3.cache.CacheFactoryRegistry">
+ <property name="factories">
+ <!-- Define each of the registered factories -->
+ <map class="java.util.HashMap" keyClass="java.lang.String"
+ valueClass="java.lang.Class">
+ <!-- NoPassivationCache -->
+ <entry>
+ <key>NoPassivationCache</key>
+ <value>org.jboss.ejb3.cache.NoPassivationCacheFactory</value>
+ </entry>
+ <!-- SimpleStatefulCache -->
+ <entry>
+ <key>SimpleStatefulCache</key>
+ <value>org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory</value>
+ </entry>
+ <!-- StatefulTreeCache -->
+ <entry>
+ <key>StatefulTreeCache</key>
+ <value>org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <!-- 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>
+ <value>org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManagerFactory</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <!-- EJB3 Pool Factory Registry -->
+ <bean name="EJB3PoolFactoryRegistry" class="org.jboss.ejb3.pool.PoolFactoryRegistry">
+ <property name="factories">
+ <!-- Define each of the registered factories -->
+ <map class="java.util.HashMap" keyClass="java.lang.String"
+ valueClass="java.lang.Class">
+ <!-- ThreadlocalPool -->
+ <entry>
+ <key>ThreadlocalPool</key>
+ <value>org.jboss.ejb3.pool.ThreadlocalPoolFactory</value>
+ </entry>
+ <!-- StrictMaxPool -->
+ <entry>
+ <key>StrictMaxPool</key>
+ <value>org.jboss.ejb3.pool.StrictMaxPoolFactory</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>
+ </bean>
+
+ <!-- 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>
+ </bean>
+
+ <!-- We could have directly used the org.jboss.ejb3.Ejb3Registry as a MC bean
+ and added the "register" and "unregister" methods as callbacks, but since
+ those methods are "static", MC complains and throws exception. So let's use
+ this indirection for the time being.
+
+ The Ejb3Registry is looked up by the IsLocalInterceptor for EJB containers.
+ -->
+
+ <bean name="EJB3ComponentRegistry" class="org.jboss.ejb3.embedded.Ejb3ComponentRegistry">
+ <!-- Accept any implementor of org.jboss.ejb3.EJBContainer -->
+ <incallback method="addContainer"/>
+ <uncallback method="removeContainer"/>
+ </bean>
+
+</deployment>
\ No newline at end of file
Property changes on: projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb-deployers-beans.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb3-connectors-jboss-beans.xml (from rev 87850, projects/ejb3/trunk/embedded/src/main/resources/META-INF/ejb3-connectors-jboss-beans.xml)
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb3-connectors-jboss-beans.xml (rev 0)
+++ projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb3-connectors-jboss-beans.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ EJB3 Connectors
+
+-->
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!--
+
+ JBoss Remoting Connector
+
+ Note: Bean Name "org.jboss.ejb3.RemotingConnector" is used
+ as a lookup value; alter only after checking java references
+ to this key.
+
+ -->
+ <bean name="org.jboss.ejb3.RemotingConnector"
+ class="org.jboss.remoting.transport.Connector">
+
+ <!-- Not using Service Binding Manager, for now, in ejb3-embedded -->
+ <property name="invokerLocator">socket://0.0.0.0/3873</property>
+
+ <property name="serverConfiguration">
+ <inject bean="ServerConfiguration" />
+ </property>
+ </bean>
+
+ <!-- Remoting Server Configuration -->
+ <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>
+
+</deployment>
\ No newline at end of file
Property changes on: projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb3-connectors-jboss-beans.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/ejb3/trunk/embedded/src/main/resources/deploy/jpa-deployers-beans.xml (from rev 87850, projects/ejb3/trunk/embedded/src/main/resources/META-INF/jpa-deployers-beans.xml)
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/deploy/jpa-deployers-beans.xml (rev 0)
+++ projects/ejb3/trunk/embedded/src/main/resources/deploy/jpa-deployers-beans.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="DataSourceDependencyResolver" class="org.jboss.ejb3.embedded.resolvers.EmbeddedDataSourceDependencyResolver"/>
+
+ <bean name="JavaEEModuleInformer" class="org.jboss.ejb3.embedded.javaee.SimpleJavaEEModuleInformer"/>
+
+ <bean name="SpecCompliantSearchStrategy" class="org.jboss.jpa.resolvers.strategy.SpecCompliantSearchStrategy"/>
+
+ <!-- DefaultPersistenceUnitDependencyResolver for spec compliant resolving. Uses SpecCompliantSearchStrategy-->
+ <bean name="PersistenceUnitDependencyResolver" class="org.jboss.jpa.resolvers.DefaultPersistenceUnitDependencyResolver"/>
+
+ <bean name="PersistenceParsingDeployer" class="org.jboss.jpa.deployers.PersistenceParsingDeployer"/>
+
+ <bean name="PersistenceDeployer" class="org.jboss.jpa.deployers.PersistenceDeployer"/>
+ <bean name="PersistenceUnitDeployer" class="org.jboss.jpa.deployers.PersistenceUnitDeployer">
+ <property name="defaultPersistenceProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>hibernate.transaction.manager_lookup_class</key>
+ <value>org.hibernate.transaction.JBossTransactionManagerLookup</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+</deployment>
\ No newline at end of file
Property changes on: projects/ejb3/trunk/embedded/src/main/resources/deploy/jpa-deployers-beans.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/ejb3/trunk/embedded/src/main/resources/deploy/namingserver-beans.xml (from rev 87850, projects/ejb3/trunk/embedded/src/main/resources/META-INF/namingserver-beans.xml)
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/deploy/namingserver-beans.xml (rev 0)
+++ projects/ejb3/trunk/embedded/src/main/resources/deploy/namingserver-beans.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -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.naming.JavaCompInitializer">
+ <depends>NamingServer</depends>
+ </bean>
+</deployment>
\ No newline at end of file
Property changes on: projects/ejb3/trunk/embedded/src/main/resources/deploy/namingserver-beans.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/ejb3/trunk/embedded/src/main/resources/deploy/transactionmanager-beans.xml (from rev 87850, projects/ejb3/trunk/embedded/src/main/resources/META-INF/transactionmanager-beans.xml)
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/deploy/transactionmanager-beans.xml (rev 0)
+++ projects/ejb3/trunk/embedded/src/main/resources/deploy/transactionmanager-beans.xml 2009-04-27 09:56:50 UTC (rev 87854)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <!-- JTA -->
+ <bean name="TransactionManager" class="org.jboss.ejb3.embedded.service.SimpleTransactionService">
+ <depends>NamingServer</depends>
+ </bean>
+
+ <bean name="RealTransactionManager">
+ <constructor factoryMethod="getTransactionManager">
+ <factory bean="TransactionManager"/>
+ </constructor>
+ </bean>
+</deployment>
Property changes on: projects/ejb3/trunk/embedded/src/main/resources/deploy/transactionmanager-beans.xml
___________________________________________________________________
Name: svn:mergeinfo
+
More information about the jboss-cvs-commits
mailing list