[jboss-cvs] JBossAS SVN: r99522 - in projects/reloaded/trunk/vdf-bootstrap-minimal/src: test/java and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 18 00:14:08 EST 2010
Author: ALRubinger
Date: 2010-01-18 00:14:06 -0500 (Mon, 18 Jan 2010)
New Revision: 99522
Added:
projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/java/VdfBootstrapDescriptorNames.java
projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_classloading.xml
projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_vdf.xml
Removed:
projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/MainDeployerDeclarativeUnitTest.java
projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/bootstrap.xml
projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/vdf.xml
Modified:
projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/MainDeployerViaBootstrapUnitTest.java
Log:
[RELOADED-10] Expose bootstrap descriptors for VDF and VFS-ClassLoading, update the tests to use the new jboss-bootstrap API to assemble these together into the runtime
Added: projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/java/VdfBootstrapDescriptorNames.java
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/java/VdfBootstrapDescriptorNames.java (rev 0)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/java/VdfBootstrapDescriptorNames.java 2010-01-18 05:14:06 UTC (rev 99522)
@@ -0,0 +1,48 @@
+import org.jboss.deployers.client.spi.main.MainDeployer;
+
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.
+ */
+
+/**
+ * Contains contracted names of the {@link ClassLoader}
+ * resources which are Microcontainer descriptors
+ * containing the components needed to boot the Virtual
+ * Deployment Framework
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ */
+public interface VdfBootstrapDescriptorNames
+{
+ /**
+ * Name of the resource containing a Microcontainer
+ * deployment descriptor capable of launching VDF elements
+ * required for {@link MainDeployer} support
+ */
+ String RESOURCE_NAME_VDF = "org.jboss.reloaded_vdf.xml";
+
+ /**
+ * Name of the resource containing a Microcontainer
+ * deployment descriptor capable of launching VFS-based
+ * ClassLoading
+ */
+ String RESOURCE_NAME_CLASSLOADING = "org.jboss.reloaded_classloading.xml";
+}
Deleted: projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/MainDeployerDeclarativeUnitTest.java
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/MainDeployerDeclarativeUnitTest.java 2010-01-18 05:12:10 UTC (rev 99521)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/MainDeployerDeclarativeUnitTest.java 2010-01-18 05:14:06 UTC (rev 99522)
@@ -1,239 +0,0 @@
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
-import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
-import org.jboss.deployers.plugins.deployers.DeployersImpl;
-import org.jboss.deployers.plugins.main.MainDeployerImpl;
-import org.jboss.deployers.plugins.managed.DefaultManagedDeploymentCreator;
-import org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator;
-import org.jboss.deployers.spi.deployer.managed.ManagedDeploymentCreator;
-import org.jboss.deployers.structure.spi.StructureBuilder;
-import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
-import org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl;
-import org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder;
-import org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure;
-import org.jboss.deployers.vfs.plugins.structure.file.FileStructure;
-import org.jboss.deployers.vfs.plugins.structure.jar.JARStructure;
-import org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.bootstrap.AbstractBootstrap;
-import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
-import org.jboss.kernel.spi.dependency.KernelController;
-import org.jboss.logging.Logger;
-import org.jboss.managed.api.factory.ManagedObjectFactory;
-import org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-
-/**
- * Test of MainDeployer/VDF which installs necessary components
- * into MC declaratively. Used as the basis for comparison versus
- * the {@link MainDeployerViaBootstrapUnitTest}, which uses the jboss-bootstrap API
- * and installs required components into the kernel controller via XML descriptors
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public class MainDeployerDeclarativeUnitTest extends MainDeployerTestBase
-{
-
- //-------------------------------------------------------------------------------------||
- // Class Members ----------------------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /**
- * Logger
- */
- private static final Logger log = Logger.getLogger(MainDeployerDeclarativeUnitTest.class);
-
- /**
- * Bootstrap
- */
- private static AbstractBootstrap bootstrap;
-
- //-------------------------------------------------------------------------------------||
- // Instance Members -------------------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /**
- * The Kernel
- */
- private Kernel kernel;
-
- //-------------------------------------------------------------------------------------||
- // Lifecycle --------------------------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /**
- * Creates the server
- */
- @BeforeClass
- public static void createBootstrap() throws Exception
- {
- bootstrap = new BasicBootstrap();
-
- }
-
- /**
- * Starts the server before each test
- * @throws Exception
- */
- @Before
- public void startServer() throws Throwable
- {
-
- bootstrap.run();
- kernel = bootstrap.getKernel();
-
- // Get controller
- final KernelController controller = kernel.getController();
-
- /*
- * Now manually install stuff needed to boot VDF
- */
-
- // ManagedObjectFactory
- final ManagedObjectFactory managedObjectFactory = ManagedObjectFactory.getInstance();
- final BeanMetaDataBuilder managedObjectFactoryBmdb = BeanMetaDataBuilderFactory.createBuilder(
- "ManagedObjectFactory", managedObjectFactory.getClass().getName()).addMethodInstallCallback(
- "addInstanceClassFactory").addMethodUninstallCallback("removeInstanceClassFactory");
- controller.install(managedObjectFactoryBmdb.getBeanMetaData(), managedObjectFactory);
-
- // ManagedObjectCreator
- final DefaultManagedObjectCreator managedObjectCreator = new DefaultManagedObjectCreator();
- managedObjectCreator.setMof(managedObjectFactory);
- final BeanMetaDataBuilder managedObjectCreatorBmdb = BeanMetaDataBuilderFactory.createBuilder(
- "ManagedObjectCreator", managedObjectCreator.getClass().getName());
- controller.install(managedObjectCreatorBmdb.getBeanMetaData(), managedObjectCreator);
-
- // Deployers
- final DeployersImpl deployers = new DeployersImpl(controller);
- deployers.setMgtObjectCreator(managedObjectCreator);
- final BeanMetaDataBuilder deployersBmdb = BeanMetaDataBuilderFactory.createBuilder("Deployers",
- deployers.getClass().getName()).addMethodInstallCallback("addDeployer").addMethodUninstallCallback(
- "removeDeployer");
- controller.install(deployersBmdb.getBeanMetaData(), deployers);
-
- // StructureBuilder
- final StructureBuilder structureBuilder = new VFSStructureBuilder();
- final BeanMetaDataBuilder structureBuilderBmdb = BeanMetaDataBuilderFactory.createBuilder("StructureBuilder",
- structureBuilder.getClass().getName());
- controller.install(structureBuilderBmdb.getBeanMetaData(), structureBuilder);
-
- // StructuralDeployers
- final VFSStructuralDeployersImpl structuralDeployers = new VFSStructuralDeployersImpl();
- structuralDeployers.setStructureBuilder(structureBuilder);
- final BeanMetaDataBuilder structuralDeployersBmdb = BeanMetaDataBuilderFactory.createBuilder(
- "StructuralDeployers", structuralDeployers.getClass().getName()).addMethodInstallCallback("addDeployer")
- .addMethodUninstallCallback("removeDeployer");
- controller.install(structuralDeployersBmdb.getBeanMetaData(), structuralDeployers);
-
- // MainDeployer
- final MainDeployerImpl mainDeployer = new MainDeployerImpl();
- mainDeployer.setDeployers(deployers);
- mainDeployer.setStructuralDeployers(structuralDeployers);
- final BeanMetaDataBuilder mainDeployerBmdb = BeanMetaDataBuilderFactory.createBuilder(NAME_MC_MAIN_DEPLOYER,
- mainDeployer.getClass().getName());
- controller.install(mainDeployerBmdb.getBeanMetaData(), mainDeployer);
-
- // ManagedDeploymentCreator
- final ManagedDeploymentCreator defaultMananagedDeploymentCreator = new DefaultManagedDeploymentCreator();
- final BeanMetaDataBuilder defaultMananagedDeploymentCreatorBmdb = BeanMetaDataBuilderFactory.createBuilder(
- "ManagedDeploymentCreator", defaultMananagedDeploymentCreator.getClass().getName());
- controller.install(defaultMananagedDeploymentCreatorBmdb.getBeanMetaData(), defaultMananagedDeploymentCreator);
-
- // DeclaredStructure
- final DeclaredStructure declaredStructure = new DeclaredStructure();
- final BeanMetaDataBuilder declaredStructureBmdb = BeanMetaDataBuilderFactory.createBuilder("DeclaredStructure",
- declaredStructure.getClass().getName());
- controller.install(declaredStructureBmdb.getBeanMetaData(), declaredStructure);
-
- // JARFilter
- final List<String> excludes = new ArrayList<String>();
- excludes.add(".class");
- final SuffixesExcludeFilter jarFilter = new SuffixesExcludeFilter(excludes);
- final BeanMetaDataBuilder jarFilterBmdb = BeanMetaDataBuilderFactory.createBuilder("JARFilter", jarFilter
- .getClass().getName());
- controller.install(jarFilterBmdb.getBeanMetaData(), jarFilter);
-
- // JARStructureCandidates
- final DefaultCandidateStructureVisitorFactory jarStructureCandidates = new DefaultCandidateStructureVisitorFactory();
- jarStructureCandidates.setFilter(jarFilter);
- final BeanMetaDataBuilder jarStructureCandidatesBmdb = BeanMetaDataBuilderFactory.createBuilder(
- "JARStructureCandidates", jarStructureCandidates.getClass().getName());
- controller.install(jarStructureCandidatesBmdb.getBeanMetaData(), jarStructureCandidates);
-
- // JARStructure
- final JARStructure jarStructure = new JARStructure();
- jarStructure.setCandidateStructureVisitorFactory(jarStructureCandidates);
- final BeanMetaDataBuilder jarStructureBmdb = BeanMetaDataBuilderFactory.createBuilder("JARStructure",
- jarStructure.getClass().getName());
- controller.install(jarStructureBmdb.getBeanMetaData(), jarStructure);
-
- // FileStructure
- final Set<String> fileStructureSuffixes = new HashSet<String>();
- fileStructureSuffixes.add("-service.xml");
- fileStructureSuffixes.add("-ds.xml");
- fileStructureSuffixes.add("-beans.xml");
- fileStructureSuffixes.add("-aop.xml");
- final FileStructure fileStructure = new FileStructure(fileStructureSuffixes);
- final BeanMetaDataBuilder fileStructureBmdb = BeanMetaDataBuilderFactory.createBuilder("FileStructure",
- fileStructure.getClass().getName());
- controller.install(fileStructureBmdb.getBeanMetaData(), fileStructure);
-
- // BeanDeployer
- final BeanDeployer beanDeployer = new BeanDeployer();
- final BeanMetaDataBuilder beanDeployerBmdb = BeanMetaDataBuilderFactory.createBuilder("BeanDeployer",
- beanDeployer.getClass().getName());
- controller.install(beanDeployerBmdb.getBeanMetaData(), beanDeployer);
-
- // KernelDeploymentDeployer
- final KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
- final BeanMetaDataBuilder kernelDeploymentDeployerBmdb = BeanMetaDataBuilderFactory.createBuilder(
- "KernelDeploymentDeployer", kernelDeploymentDeployer.getClass().getName());
- controller.install(kernelDeploymentDeployerBmdb.getBeanMetaData(), kernelDeploymentDeployer);
-
- // BeanMetaDataDeployer
- final BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(controller);
- final BeanMetaDataBuilder beanMetaDataDeployerBmdb = BeanMetaDataBuilderFactory.createBuilder(
- "BeanMetaDataDeployer", beanMetaDataDeployer.getClass().getName()).addMethodInstallCallback(
- "addControllerContextCreator").addMethodUninstallCallback("removeControllerContextCreator");
- controller.install(beanMetaDataDeployerBmdb.getBeanMetaData(), beanMetaDataDeployer);
-
- /*
- * We haven't added ClassLoading stuff from vdf.xml
- */
-
- }
-
- /**
- * Stops the server after each test
- * @throws Exception
- */
- @After
- public void stopServer() throws Exception
- {
- //TODO
- }
-
- //-------------------------------------------------------------------------------------||
- // Required Implementations -----------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /**
- * {@inheritDoc}
- * @see MainDeployerTestBase#getKernel()
- */
- @Override
- Kernel getKernel()
- {
- return kernel;
- }
-
-}
Modified: projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/MainDeployerViaBootstrapUnitTest.java
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/MainDeployerViaBootstrapUnitTest.java 2010-01-18 05:12:10 UTC (rev 99521)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/MainDeployerViaBootstrapUnitTest.java 2010-01-18 05:14:06 UTC (rev 99522)
@@ -1,7 +1,9 @@
-import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.List;
+import org.jboss.bootstrap.api.descriptor.BootstrapDescriptor;
+import org.jboss.bootstrap.api.descriptor.ClassLoaderResourceBootstrapDescriptor;
import org.jboss.bootstrap.api.lifecycle.LifecycleState;
import org.jboss.bootstrap.api.mc.server.MCServer;
import org.jboss.bootstrap.api.mc.server.MCServerFactory;
@@ -78,10 +80,15 @@
{
// Create a server
final MCServer mcServer = MCServerFactory.createServer();
- // Set the bootstrap home
- final URL bootstrapHome = getBootstrapHome();
- log.info("Using bootstrap home: " + bootstrapHome.toExternalForm());
- mcServer.getConfiguration().bootstrapHome(bootstrapHome);
+
+ // Add the required bootstrap descriptors
+ final List<BootstrapDescriptor> descriptors = mcServer.getConfiguration().getBootstrapDescriptors();
+ descriptors.add(new ClassLoaderResourceBootstrapDescriptor(VdfBootstrapDescriptorNames.RESOURCE_NAME_VDF));
+ descriptors
+ .add(new ClassLoaderResourceBootstrapDescriptor(VdfBootstrapDescriptorNames.RESOURCE_NAME_CLASSLOADING));
+
+ log.info("Using bootstrap descriptors:" + descriptors);
+
// Set
server = mcServer;
}
@@ -114,18 +121,6 @@
}
//-------------------------------------------------------------------------------------||
- // Internal Helper Methods ------------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /**
- * Obtains the location of the bootstrap home
- */
- private static URL getBootstrapHome()
- {
- return MainDeployerViaBootstrapUnitTest.class.getProtectionDomain().getCodeSource().getLocation();
- }
-
- //-------------------------------------------------------------------------------------||
// Required Implementations -----------------------------------------------------------||
//-------------------------------------------------------------------------------------||
Deleted: projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/bootstrap.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/bootstrap.xml 2010-01-18 05:12:10 UTC (rev 99521)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/bootstrap.xml 2010-01-18 05:14:06 UTC (rev 99522)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bootstrap xmlns="urn:jboss:bootstrap:1.0">
-
-
- <url>vdf.xml</url>
-
-
-</bootstrap>
\ No newline at end of file
Copied: projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_classloading.xml (from rev 99519, projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/vdf.xml)
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_classloading.xml (rev 0)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_classloading.xml 2010-01-18 05:14:06 UTC (rev 99522)
@@ -0,0 +1,31 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- VFS ClassLoader -->
+ <bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
+ <constructor factoryClass="org.jboss.classloader.spi.ClassLoaderSystem" factoryMethod="getInstance"/>
+ </bean>
+ <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
+ <incallback method="addModule" state="Configured"/>
+ <uncallback method="removeModule" state="Configured"/>
+ </bean>
+ <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="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>
Added: projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_vdf.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_vdf.xml (rev 0)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_vdf.xml 2010-01-18 05:14:06 UTC (rev 99522)
@@ -0,0 +1,93 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- The ManagedObjectFactory -->
+ <bean name="ManagedObjectFactory">
+ <constructor factoryClass="org.jboss.managed.api.factory.ManagedObjectFactory" factoryMethod="getInstance"/>
+ <!-- Accept any implementor of InstanceClassFactory -->
+ <incallback method="addInstanceClassFactory"/>
+ <uncallback method="removeInstanceClassFactory"/>
+ </bean>
+
+ <!-- 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 ManagedDeploymentCreator implementation -->
+ <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.DefaultManagedDeploymentCreator" />
+ <!-- The ManagedObjectCreator implementation -->
+ <bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator">
+ <property name="mof"><inject bean="ManagedObjectFactory"/></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>
+ <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property>
+ <!-- Accept any implementor of deployer -->
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ </bean>
+
+ <!-- A declared structure descriptor deployer -->
+ <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
+
+ <!-- JAR Structure -->
+ <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
+ <property name="candidateStructureVisitorFactory">
+ <!-- Any file that is not an ordinary directory is a candidate -->
+ <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
+ <!-- A filter to exclude some obvious non-subdeployments -->
+ <property name="filter">
+ <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
+ <constructor><parameter>
+ <list elementClass="java.lang.String">
+ <!-- Exclude class files as subdeployments -->
+ <value>.class</value>
+ </list>
+ </parameter></constructor>
+ </bean>
+ </property>
+ </bean>
+ </property>
+ </bean>
+
+ <!-- File Structure -->
+ <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
+ <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml -->
+ <constructor>
+ <parameter>
+ <set elementClass="java.lang.String">
+ <value>-service.xml</value>
+ <value>-beans.xml</value>
+ <value>-ds.xml</value>
+ <value>-aop.xml</value>
+ </set>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- 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.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
+ <!-- Accept any implementor of KernelControllerContextCreator -->
+ <incallback method="addControllerContextCreator"/>
+ <uncallback method="removeControllerContextCreator"/>
+ </bean>
+
+</deployment>
Deleted: projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/vdf.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/vdf.xml 2010-01-18 05:12:10 UTC (rev 99521)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/vdf.xml 2010-01-18 05:14:06 UTC (rev 99522)
@@ -1,121 +0,0 @@
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- The ManagedObjectFactory -->
- <bean name="ManagedObjectFactory">
- <constructor factoryClass="org.jboss.managed.api.factory.ManagedObjectFactory" factoryMethod="getInstance"/>
- <!-- Accept any implementor of InstanceClassFactory -->
- <incallback method="addInstanceClassFactory"/>
- <uncallback method="removeInstanceClassFactory"/>
- </bean>
-
- <!-- 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 ManagedDeploymentCreator implementation -->
- <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.DefaultManagedDeploymentCreator" />
- <!-- The ManagedObjectCreator implementation -->
- <bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator">
- <property name="mof"><inject bean="ManagedObjectFactory"/></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>
- <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property>
- <!-- Accept any implementor of deployer -->
- <incallback method="addDeployer"/>
- <uncallback method="removeDeployer"/>
- </bean>
-
- <!-- A declared structure descriptor deployer -->
- <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
-
- <!-- JAR Structure -->
- <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
- <property name="candidateStructureVisitorFactory">
- <!-- Any file that is not an ordinary directory is a candidate -->
- <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
- <!-- A filter to exclude some obvious non-subdeployments -->
- <property name="filter">
- <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
- <constructor><parameter>
- <list elementClass="java.lang.String">
- <!-- Exclude class files as subdeployments -->
- <value>.class</value>
- </list>
- </parameter></constructor>
- </bean>
- </property>
- </bean>
- </property>
- </bean>
-
- <!-- File Structure -->
- <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
- <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml -->
- <constructor>
- <parameter>
- <set elementClass="java.lang.String">
- <value>-service.xml</value>
- <value>-beans.xml</value>
- <value>-ds.xml</value>
- <value>-aop.xml</value>
- </set>
- </parameter>
- </constructor>
- </bean>
-
- <!-- 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.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
- <!-- Accept any implementor of KernelControllerContextCreator -->
- <incallback method="addControllerContextCreator"/>
- <uncallback method="removeControllerContextCreator"/>
- </bean>
-
- <!-- VFS ClassLoader -->
- <bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
- <constructor factoryClass="org.jboss.classloader.spi.ClassLoaderSystem" factoryMethod="getInstance"/>
- </bean>
- <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
- <incallback method="addModule" state="Configured"/>
- <uncallback method="removeModule" state="Configured"/>
- </bean>
- <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="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>
More information about the jboss-cvs-commits
mailing list